merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:29 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:40 +0000 (14:19 -0700)
commit6d63070...acf88cd03b4bc73fd64fea046accd450
tree812502f...3d4ec37dc712937ae9898b18e1e2b901copy hash to clipboard (tree)
parentb630b81...7055a6fd56edfdf3ba85e9dea27dd397copy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh