merge-recursive: Fix spurious 'refusing to lose untracked file...' messages

[thirdparty/git.git] / t / t6022-merge-rename.sh

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 0fd2b0a10e47e3b77a16600aadcdd828cf5ef601..8f75762bfb6023d04f7ad695977e97763a9e2e03 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -787,7 +787,7 @@ test_expect_success 'setup spurious "refusing to lose untracked" message' '
        git commit -mC
 '
 
-test_expect_failure 'no spurious "refusing to lose untracked" message' '
+test_expect_success 'no spurious "refusing to lose untracked" message' '
        git checkout master^0 &&
        test_must_fail git merge rename^0 2>errors.txt &&
        ! grep "refusing to lose untracked file" errors.txt