Documentation: document pitfalls with 3-way merge

diff --git a/combine-diff.c b/combine-diff.c
index 3d2aaf34ab53accccf1c3877557522ea012be42d..4fc16ad4f35c558daf5bf96865801828d10b4b9b 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -166,7 +166,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