conflict_rename_delete(): Check whether D/F conflicts are still present
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:05 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:04 +0000 (17:37 -0700)
commita0de2f6...d3b79f7ab61ea90f795b964a7f7f3d6d
treef8f06b2...4d13cbb721a17892ee543d5b6265bdb7copy hash to clipboard (tree)
parent71f7ffc...02a2f38436c59146b86897389130a538copy hash to clipboard (diff)
merge-recursive.c
t/t6022-merge-rename.sh