Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
diff hunk pattern: fix misconverted "\{" tex macro introducers
[gitweb.git]
/
t
/
t6033-merge-crlf.sh
diff --git
a/t/t6033-merge-crlf.sh
b/t/t6033-merge-crlf.sh
index ea22837aa789e11e4c6b7c55d34747c94d5ab7ae..75d9602de4d4238b4182956127540525f711d33f 100755
(executable)
--- 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 &&