merge-recursive: add handling for rename/rename/add-dest/add-dest

diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 3be5059318cb96a3ef0fad7de03e273da79ba3e4..68759199120481b48da5b31e147e25e263f37b50 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -551,7 +551,7 @@ test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
        git commit -m two
 '
 
-test_expect_failure 'rename/rename/add-dest merge still knows about conflicting file versions' '
+test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' '
        git checkout C^0 &&
        test_must_fail git merge -s recursive B^0 &&