t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW

[git.git] / t / t3032-merge-recursive-options.sh

diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index f70f6c4da40a6455ff2e66ee53e8cc6a262c4787..29e049af55615fdaa23960e25eb2c2eb9374db58 100755 (executable)
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -14,6 +14,7 @@ test_description='merge-recursive options
 . ./test-lib.sh
 
 test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
+test_have_prereq MINGW && export GREP_OPTIONS=-U
 
 test_expect_success 'setup' '
        conflict_hunks () {