X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=combine-diff.c;h=88525b37cf461ee922b81fd6848be5efc8e34542;hb=1e93c28f53e19945f059fd709729d724f8c06446;hp=6dc06093d3c1eb6f3ab7a9cc79f0f192e16dc617;hpb=69490f345943f6f6d7ae52e0e9c870e8b48a5dea;p=~andy%2Fgit

diff --git a/combine-diff.c b/combine-diff.c
index 6dc06093d..88525b37c 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -165,7 +165,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 
 	/*
 	 * Coalesce new lines into base by finding the LCS
-	 * - Create the table to run dynamic programing
+	 * - Create the table to run dynamic programming
 	 * - Compute the LCS
 	 * - Then reverse read the direction structure:
 	 *   - If we have MATCH, assign parent to base flag, and consume