merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:13 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:38 +0000 (14:19 -0700)
commitc52ff85...97c698c902870305a010e2303e297b87
tree7c28c28...9dd114a9f525891e8291f0319291fd2ecopy hash to clipboard (tree)
parent6bdaead...e58ab2aa3ea81a998117d1d5afb41a3bcopy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh