merge-recursive: check for directory level conflicts
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:51:56 +0000 (10:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:02:52 +0000 (13:02 -0800)
commit53e32d4...52a5cb073c8add8e7867fd7e76c2deff
tree1f49458...6bc55dc854be5e3e7cb10c695aef374bcopy hash to clipboard (tree)
parent8383408...c79300211778b615b353b3463ccc369acopy hash to clipboard (diff)
merge-recursive.c