Fix an off-by-one bug.

I assume .... I don't remember, sorry.

diff --git a/merge2.c b/merge2.c
index f4b3748d2d232b801bdc865d0f1555ae30199a5a..768baeea506327d5a9ecebcf0c839850f67b6b6c 100644 (file)
--- a/merge2.c
+++ b/merge2.c
@@ -213,7 +213,7 @@ inline int isolate_conflicts(struct file af, struct file bf, struct file cf,
                                                break;
                                }
                        }
-                       i = j;
+                       i = j - 1;
                }
        return cnt;
 }