merge-recursive: Save D/F conflict filenames instead of unlinking them
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:58 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:35 +0000 (14:19 -0700)
commit70cc3d3...eba58f8bf177c91d82781fb727a9a4fa
tree358742f...adb54e44bd2de52222a474760050e99acopy hash to clipboard (tree)
parentf2507b4...0ef0b7fc8c1e75004e8a86a0430dc512copy hash to clipboard (diff)
merge-recursive.c
merge-recursive.h