diff options
Diffstat (limited to 't/t6022-merge-rename.sh')
| -rwxr-xr-x | t/t6022-merge-rename.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 0fd2b0a10e..8f75762bfb 100755 --- 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 |