X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6038-merge-text-auto.sh;h=d9c2d386ddf8caff4b87fa457c23757f76c293c7;hb=9b0ebc722cfc12bd14934aab5cf77ebe654e36e6;hp=460bf741b594d4d6b7f2220ac0f1a0d28c653619;hpb=f29db856e7a736dd5109223d71c548367bc127ae;p=git.git

diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh
index 460bf741b..d9c2d386d 100755
--- 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 &&