wolfpython
diff --git a/‎t/t6038-merge-text-auto.sh‎
Lines changed: 3 additions & 1 deletion b/‎t/t6038-merge-text-auto.sh‎
Lines changed: 3 additions & 1 deletion
@@ -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/" "$@"
 	}
 '
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ test_description='CRLF merge conflict across text=auto change`
`14`	`14`
`15`	`15`	`. ./test-lib.sh`
`16`	`16`
	`17`	`+test_have_prereq MINGW && SED_OPTIONS=-b`
	`18`	`+`
`17`	`19`	`test_expect_success setup '`
`18`	`20`	`git config core.autocrlf false &&`
`19`	`21`
`@@ -60,7 +62,7 @@ test_expect_success setup '`
`60`	`62`
`61`	`63`	`test_expect_success 'set up fuzz_conflict() helper' '`
`62`	`64`	`fuzz_conflict() {`
`63`		`- sed -e "s/^\([<>=]......\) .*/\1/" "$@"`
	`65`	`+ sed $SED_OPTIONS -e "s/^\([<>=]......\) .*/\1/" "$@"`
`64`	`66`	`}`
`65`	`67`	`'`
`66`	`68`