conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:06 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:05 +0000 (17:37 -0700)
commit2adc7dc...111636ed16601dc7516ced1c5cfda088
treed40b124...9f9be45e4b74c7991cbcc3bb32d2031bcopy hash to clipboard (tree)
parenta0de2f6...d3b79f7ab61ea90f795b964a7f7f3d6dcopy hash to clipboard (diff)
merge-recursive.c
t/t6022-merge-rename.sh