Add additional testcases for D/F conflicts
authorElijah Newren <newren@gmail.com>
Fri, 9 Jul 2010 13:10:51 +0000 (07:10 -0600)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Jul 2010 23:10:54 +0000 (16:10 -0700)
commitf15652d90c37ca56db08d325c871f2cc8f7d509e
treee7f63464b2043ef4c36a958dd4b1373ee79104e4
parentd599e0484f8ebac8cc50e9557a4c3d246826843d
Add additional testcases for D/F conflicts

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6035-merge-dir-to-symlink.sh
t/t9350-fast-export.sh