merge-recursive: use handle_file_collision for add/add conflicts
authorElijah Newren <newren@gmail.com>
Thu, 8 Nov 2018 04:40:28 +0000 (20:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Nov 2018 05:23:53 +0000 (14:23 +0900)
commitdcf2815...98589b1fa0a01e7a8459c213581d4412
tree299e3fd...9ba582cf0aaa7636e5e93f731a28dca4copy hash to clipboard (tree)
parentbbafc9c...4ae7109f636772350934b3c5d747da44copy hash to clipboard (diff)
merge-recursive.c