merge-recursive: Fix multiple file rename across D/F conflict
authorElijah Newren <newren@gmail.com>
Tue, 17 Aug 2010 23:53:19 +0000 (17:53 -0600)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:08:08 +0000 (12:08 -0700)
commitae74548...ad7a4ceca0e903da6df21be2c1ebfc29
treef3b8da7...1ad9bade1c551b0968b252b7af9a87b5copy hash to clipboard (tree)
parent5601ba6...74cfbd1249a6d38b72159a7d3ccf8315copy hash to clipboard (diff)
merge-recursive.c
t/t6031-merge-recursive.sh