merge-recursive: Delay content merging for renames

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 1f29c0a94d672d75b76743ba8a8edf1558401987..edbfa477c1c01e7dc233d4b9cd9dc88d529c293f 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -455,7 +455,7 @@ cat >expected <<\EOF &&
 >>>>>>> dir-not-in-way
 EOF
 
-test_expect_failure 'Rename+D/F conflict; renamed file cannot merge, dir not in way' '
+test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in way' '
        git reset --hard &&
        rm -rf dir~* &&
        git checkout -q renamed-file-has-conflicts^0 &&