From: Elijah Newren <newren@gmail.com>
Date: Tue, 17 Aug 2010 23:53:19 +0000 (-0600)
Subject: merge-recursive: Fix multiple file rename across D/F conflict
X-Git-Tag: v1.7.3-rc0~30^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ae745487ad7a4ceca0e903da6df21be2c1ebfc29?hp=ae745487ad7a4ceca0e903da6df21be2c1ebfc29

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>
---