merge-recursive: Avoid excessive output for and reprocessing of renames

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index c50ee295a7bc0e8df74aa5913999b5900a07f2f8..bd75e0e6430ff6e536f0b10d28cc4793d0f7fe6c 100755 (executable)
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -57,7 +57,7 @@ test_expect_success FILEMODE 'verify executable bit on file' '
        test -x file2
 '
 
-test_expect_failure 'merging with triple rename across D/F conflict' '
+test_expect_success 'merging with triple rename across D/F conflict' '
        git reset --hard HEAD &&
        git checkout -b main &&
        git rm -rf . &&