merge-recursive: Fix deletion of untracked file in rename/delete conflicts
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:03 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:36 +0000 (14:19 -0700)
commit531357a...cc2b93ec68099890b835f50e462ceab7
tree0b23ebf...66061e2e0174f1b35e65c887e72ca15bcopy hash to clipboard (tree)
parentb8ddf16...24f2d4f29a73b89dabbb764763744abecopy hash to clipboard (diff)
merge-recursive.c
t/t6042-merge-rename-corner-cases.sh