Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Disallow empty section and variable names
[gitweb.git]
/
t
/
t6038-merge-text-auto.sh
diff --git
a/t/t6038-merge-text-auto.sh
b/t/t6038-merge-text-auto.sh
index 460bf741b594d4d6b7f2220ac0f1a0d28c653619..d9c2d386ddf8caff4b87fa457c23757f76c293c7 100755
(executable)
--- a/
t/t6038-merge-text-auto.sh
+++ b/
t/t6038-merge-text-auto.sh
@@
-14,7
+14,7
@@
test_description='CRLF merge conflict across text=auto change
. ./test-lib.sh
-test_have_prereq
MINGW
&& SED_OPTIONS=-b
+test_have_prereq
SED_STRIPS_CR
&& SED_OPTIONS=-b
test_expect_success setup '
git config core.autocrlf false &&