diff options
Diffstat (limited to 't/t6413-merge-crlf.sh')
| -rwxr-xr-x | t/t6413-merge-crlf.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6413-merge-crlf.sh b/t/t6413-merge-crlf.sh index b4f4a31..647ea1e 100755 --- a/t/t6413-merge-crlf.sh +++ b/t/t6413-merge-crlf.sh @@ -34,14 +34,14 @@ test_expect_success setup ' test_expect_success 'Check "ours" is CRLF' ' git reset --hard initial && git merge side -s ours && - cat file | remove_cr | append_cr >file.temp && + remove_cr <file | append_cr >file.temp && test_cmp file file.temp ' 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 && + remove_cr <file | append_cr >file.temp && test_cmp file file.temp ' |