merge-recursive: Fix recursive case with D/F conflict via add/add conflict
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:55 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:34 +0000 (14:19 -0700)
commit7b1c610...84a46fa237627b3307707afb520e555c
tree3487f1b...b6f8cf255dd934e22d1590eaef3435b9copy hash to clipboard (tree)
parent0b30e81...5130a78bc7c0e13e7f45ba105bd206b8copy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh