diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-08-17 17:53:19 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:08:08 -0700 |
| commit | ae745487ad7a4ceca0e903da6df21be2c1ebfc29 (patch) | |
| tree | f3b8da751ad9bade1c551b0968b252b7af9a87b5 /xdiff | |
| parent | t6031: Add a testcase covering multiple renames across a D/F conflict (diff) | |
| download | tgif-ae745487ad7a4ceca0e903da6df21be2c1ebfc29.tar.xz | |
merge-recursive: Fix multiple file rename across D/F conflict
In 5a2580d (merge_recursive: Fix renames across paths below D/F conflicts
2010-07-09), detection was added for renames across paths involved in a
directory<->file conflict. However, the change accidentally involved
reusing an outer loop index ('i') in an inner loop, changing its values
and causing a slightly different type of breakage for cases where there are
multiple renames across the D/F conflict. Fix by creating a new temporary
variable 'i'.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions