diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-25 01:24:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-25 01:28:44 -0800 |
| commit | ab242f809a9e06ebf935c0512155fc5661ab84ab (patch) | |
| tree | 4829afb6d0e4a7947756b89207f6e380fb906d18 /diff-delta.c | |
| parent | cef19c7af5202c547abe4c8a538ac7b9a4970f0e (diff) | |
| download | git-ab242f809a9e06ebf935c0512155fc5661ab84ab.tar.gz git-ab242f809a9e06ebf935c0512155fc5661ab84ab.tar.xz | |
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>
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions