merge-recursive: Fix deletion of untracked file in rename/delete conflicts

diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 427fe1c913161b27107fe86de0ea419473061bc0..668ec6d498723dd49a395311c9706c177003e499 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -26,7 +26,7 @@ test_expect_success 'setup rename/delete + untracked file' '
        echo "Myyy PRECIOUSSS" >ring
 '
 
-test_expect_failure "Does git preserve Gollum's precious artifact?" '
+test_expect_success "Does git preserve Gollum's precious artifact?" '
        test_must_fail git merge -s recursive rename-the-ring &&
 
        # Make sure git did not delete an untracked file