merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
commitc52ff85d97c698c902870305a010e2303e297b87
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:13 +0000 (11 23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:38 +0000 (14 14:19 -0700)
tree7c28c2849dd114a9f525891e8291f0319291fd2e
parent6bdaead1e58ab2aa3ea81a998117d1d5afb41a3b
merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base

When renaming one file to two files, we really should be doing a content
merge.  Also, in the recursive case, undoing the renames and recording the
merged file in the index with the source of the rename (while deleting
both destinations) allows the renames to be re-detected in the
non-recursive merge and will result in fewer spurious conflicts.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t6036-recursive-corner-cases.sh