rerere: handle conflicts with multiple stage #1 entries

A conflicted index can have multiple stage #1 entries when dealing with a criss-cross merge and using the "resolve" merge strategy. Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years ago · 5eda906b28
1 changed files with 1 additions and 1 deletions
--- a/rerere.c
+++ b/rerere.c
@ -369,7 +369,7 @@ static int check_one_conflict(int i, int *type)
 	}
 	*type = PUNTED;
-	if (ce_stage(e) == 1)
+	while (ce_stage(active_cache[i]) == 1)
 		i++;
 	/* Only handle regular files with both stages #2 and #3 */