merge-recursive: Allow make_room_for_path() to remove D/F entries
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:01 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:36 +0000 (14:19 -0700)
commited0148a...20ec2ec88f0574c2e107aba0a46936e1
tree3566f61...08552b0022f7e75bc6bf548f17d93c6acopy hash to clipboard (tree)
parent86d4b52...d8a4752cc689279fb6d38c8697a507bbcopy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh