merge-recursive: Move handling of double rename of one file to two

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 02dea16459f54f468aec9d68adfc345a40453e37..1f29c0a94d672d75b76743ba8a8edf1558401987 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -652,7 +652,7 @@ test_expect_success 'setup rename of one file to two, with directories in the wa
        git commit -m "Put one/file in the way, rename to two"
 '
 
-test_expect_failure 'check handling of differently renamed file with D/F conflicts' '
+test_expect_success 'check handling of differently renamed file with D/F conflicts' '
        git checkout -q first-rename^0 &&
        test_must_fail git merge --strategy=recursive second-rename &&