merge-recursive: improve auto-merging messages with path collisions
authorElijah Newren <newren@gmail.com>
Tue, 16 Oct 2018 20:19:47 +0000 (13:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Oct 2018 04:54:36 +0000 (13:54 +0900)
commit2b168ef...ffa308537d858b9910170e4d314a8f4a
tree3a90721...fcbf29fc8db3eb205cfa9b9b52e5652acopy hash to clipboard (tree)
parentd957355...7550e87c8e58a92126c45f1a3875603acopy hash to clipboard (diff)
merge-recursive.c