merge-recursive: avoid clobbering untracked files with directory renames

diff --git a/t/t3103-ls-tree-misc.sh b/t/t3103-ls-tree-misc.sh
index c9c20f95e3f6264132c6d477851ff71bf18ad073..09dcf043fdff1495dc4e0d1e56b9118c4f5feaeb 100755 (executable)
--- a/t/t3103-ls-tree-misc.sh
+++ b/t/t3103-ls-tree-misc.sh
@@ -16,7 +16,7 @@ test_expect_success 'setup' '
        git commit -m test
 '
 
-test_expect_failure 'ls-tree fails with non-zero exit code on broken tree' '
+test_expect_success 'ls-tree fails with non-zero exit code on broken tree' '
        rm -f .git/objects/5f/cffbd6e4c5c5b8d81f5e9314b20e338e3ffff5 &&
        test_must_fail git ls-tree -r HEAD
 '