| commit | ab242f809a9e06ebf935c0512155fc5661ab84ab | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 25 Feb 2007 09:24:34 +0000 (25 01:24 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 25 Feb 2007 09:28:44 +0000 (25 01:28 -0800) | ||
| tree | 4829afb6d0e4a7947756b89207f6e380fb906d18 | treesnapshot (tar.gz zip) |
| parent | cef19c7af5202c547abe4c8a538ac7b9a4970f0e | commitdiff |
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>
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>
| builtin-rerere.c | diffblobblamehistory |