Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maint

[~andy/git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 6dc06093d3c1eb6f3ab7a9cc79f0f192e16dc617..88525b37cf461ee922b81fd6848be5efc8e34542 100644 (file)
--- 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