mirror of
https://github.com/git/git.git
synced 2024-09-21 21:23:11 +02:00
rerere: do not skip two conflicted paths next to each other.
The code forgot to take the for (;;) loop control into account, incrementing the index once too many. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
cef19c7af5
commit
ab242f809a
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user