From db5bf0a820a0e800489d37bb6d57acbdf4597ecd Mon Sep 17 00:00:00 2001
From: Neil Brown <neilb@suse.de>
Date: Thu, 5 Mar 2009 16:38:17 +1100
Subject: [PATCH] Fix an off-by-one bug.

I assume .... I don't remember, sorry.
---
 merge2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge2.c b/merge2.c
index f4b3748..768baee 100644
--- 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;
 }
-- 
2.39.5