merge-recursive: Improve handling of rename target vs. directory addition

diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 668ec6d498723dd49a395311c9706c177003e499..968055d47cfe2cd55110c606d694c76b648934fe 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -234,7 +234,7 @@ test_expect_success 'setup content merge + rename/directory conflict' '
        git commit -m left
 '
 
-test_expect_failure 'rename/directory conflict + clean content merge' '
+test_expect_success 'rename/directory conflict + clean content merge' '
        git reset --hard &&
        git reset --hard &&
        git clean -fdqx &&