merge-recursive: Make room for directories in D/F conflicts

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index 7b1ce82707b8c2eed7e65e521e6dedf2a6070523..b129f1dbd5a5ffe4413ea359f3e893e935117115 100755 (executable)
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -83,7 +83,7 @@ test_expect_success 'modify/delete + directory/file conflict' '
        test -f letters~modify
 '
 
-test_expect_failure 'modify/delete + directory/file conflict; other way' '
+test_expect_success 'modify/delete + directory/file conflict; other way' '
        git reset --hard &&
        git clean -f &&
        git checkout modify^0 &&