merge-recursive: Fix modify/delete resolution in the recursive case
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:11 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:38 +0000 (14:19 -0700)
commitec61d14...63470b02db0d6e3825e2b5bbb1815cb6
treeeb2925c...839584acf9575b31625b37526e362804copy hash to clipboard (tree)
parent5b448b8...30308b1f5a7a721cb1bf0ba557b5c78dcopy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh