diff options
Diffstat (limited to 't/t6033-merge-crlf.sh')
| -rwxr-xr-x | t/t6033-merge-crlf.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6033-merge-crlf.sh b/t/t6033-merge-crlf.sh index ea22837aa7..75d9602de4 100755 --- a/t/t6033-merge-crlf.sh +++ b/t/t6033-merge-crlf.sh @@ -42,7 +42,7 @@ test_expect_success 'Check "ours" is CRLF' ' test_cmp file file.temp ' -test_expect_failure 'Check that conflict file is CRLF' ' +test_expect_success 'Check that conflict file is CRLF' ' git reset --hard a && test_must_fail git merge side && cat file | remove_cr | append_cr >file.temp && |