diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh index adc72840d1..c96599a6bb 100755 --- a/t/t3032-merge-recursive-options.sh +++ b/t/t3032-merge-recursive-options.sh @@ -13,9 +13,14 @@ test_description='merge-recursive options . ./test-lib.sh +if test_have_prereq MINGW; then + export GREP_OPTIONS=-U + SED_OPTIONS=-b +fi + test_expect_success 'setup' ' conflict_hunks () { - sed -n -e " + sed $SED_OPTIONS -n -e " /^<<<