X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6038-merge-text-auto.sh;h=460bf741b594d4d6b7f2220ac0f1a0d28c653619;hb=9018af4f98b98738f3cd1268a16d143762ebb6f2;hp=52d0dc4bb8f80393c79935f9c951b5323287e41c;hpb=a27d5bef56d0689873b29236addf4f7879e974ec;p=git.git

diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh
index 52d0dc4bb..460bf741b 100755
--- a/t/t6038-merge-text-auto.sh
+++ b/t/t6038-merge-text-auto.sh
@@ -14,6 +14,8 @@ test_description='CRLF merge conflict across text=auto change
 
 . ./test-lib.sh
 
+test_have_prereq MINGW && SED_OPTIONS=-b
+
 test_expect_success setup '
 	git config core.autocrlf false &&
 
@@ -60,7 +62,7 @@ test_expect_success setup '
 
 test_expect_success 'set up fuzz_conflict() helper' '
 	fuzz_conflict() {
-		sed -e "s/^\([<>=]......\) .*/\1/" "$@"
+		sed $SED_OPTIONS -e "s/^\([<>=]......\) .*/\1/" "$@"
 	}
 '