merge-recursive: check for directory level conflicts
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:06 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit96e7ffb...c31d9e02e2548df5d9a9701e5a83651d
tree50f3499...d6760635f1923ec9ad91cb6ef0353c66copy hash to clipboard (tree)
parent7fe40b8...efc721bfcbe69f00f950eb9f7a9cd236copy hash to clipboard (diff)
merge-recursive.c