merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
authorElijah Newren <newren@gmail.com>
Wed, 8 Sep 2010 06:40:41 +0000 (00:40 -0600)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2010 00:03:02 +0000 (17:03 -0700)
commit86273e5...64ab7faaa84c3de1a428ed24a6cfdf1f
tree168f9e9...421bcd609fcadbeadfbf69715ac30278copy hash to clipboard (tree)
parent56bfd76...e5e602031eab8ce881b8ab0c50d2cfcccopy hash to clipboard (diff)
merge-recursive.c
t/t3509-cherry-pick-merge-df.sh