summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin-rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c
index 318d959d89..ac0bf335a8 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -160,7 +160,7 @@ static int find_conflict(struct path_list *conflict)
ce_stage(e3) == 3 && ce_same_name(e1, e2) &&
ce_same_name(e1, e3)) {
path_list_insert((const char *)e1->name, conflict);
- i += 3;
+ i += 2;
}
}
return 0;