t7810: overlapping pathspecs and depth limit

diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index f70f6c4da40a6455ff2e66ee53e8cc6a262c4787..44f5421be45579b10c5556a958404ad2daa02002 100755 (executable)
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -14,17 +14,18 @@ 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 () {
                sed $SED_OPTIONS -n -e "
-                       /^<<<</ b inconflict
+                       /^<<<</ b conflict
                        b
-                       : inconflict
+                       : conflict
                        p
                        /^>>>>/ b
                        n
-                       b inconflict
+                       b conflict
                " "$@"
        } &&