merge-recursive: Fix D/F conflicts
authorElijah Newren <newren@gmail.com>
Fri, 9 Jul 2010 13:10:53 +0000 (07:10 -0600)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Jul 2010 23:12:42 +0000 (16:12 -0700)
commit3734893...ff391f01981e8af10b2f615268fd2509
treecf7f9b6...eb2d8057a483e31255ab0497e5c5bb4dcopy hash to clipboard (tree)
parentf433f70...47ebf038a862ca72565ae42e50d4adfacopy hash to clipboard (diff)
merge-recursive.c
t/t6035-merge-dir-to-symlink.sh