From 6845d53e879346f58610bd2d6608a09e1b7515ed Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 16 Apr 2014 17:55:39 -0500 Subject: [PATCH] fixup! MinGW: Update tests to handle a native eol of crlf --- t/t6038-merge-text-auto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh index 67c59b7e97..85c10b0940 100755 --- a/t/t6038-merge-text-auto.sh +++ b/t/t6038-merge-text-auto.sh @@ -131,7 +131,7 @@ test_expect_success 'Detect LF/CRLF conflict from addition of text=auto' ' if test_have_prereq NATIVE_CRLF; then echo ======= | append_cr >>expected && echo first line | append_cr >>expected && - echo same line | append_cr >>expected + echo same line | append_cr >>expected else echo ======= >>expected && echo first line >>expected &&