Merge branch 'rj/test-fixes' into next

* rj/test-fixes:
  t4135-*.sh: Skip the "backslash" tests on cygwin
  t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
  t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
  t6038-*.sh: Pass the -b (--binary) option to sed on cygwin

Conflicts:
	t/t3032-merge-recursive-options.sh

diff --cc t/t3032-merge-recursive-options.sh
index adc72840d12b73f833294a6b908fefb225453f2e,29e049af55615fdaa23960e25eb2c2eb9374db58..44f5421be45579b10c5556a958404ad2daa02002
--- 1/t/t3032-merge-recursive-options.sh
--- 2/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@@ -13,12 -13,15 +13,15 @@@ test_description='merge-recursive optio
  
  . ./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 -n -e "
+               sed $SED_OPTIONS -n -e "
 -                      /^<<<</ b inconflict
 +                      /^<<<</ b conflict
                        b
 -                      : inconflict
 +                      : conflict
                        p
                        /^>>>>/ b
                        n

diff --cc t/test-lib.sh
Simple merge