merge-recursive: Avoid doubly merging rename/add conflict contents
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:59 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:04 +0000 (17:37 -0700)
commit2a669c3...1a857f53d946dec762e6f22a54b12dd2
tree6e4c68b...e60102e543936f06e67479e5f1cce019copy hash to clipboard (tree)
parent61b8bca...2d8f71c566150b0a12e35a9fdc76b82bcopy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh