Merge branch 'rj/test-fixes'

* 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 --combined t/t3032-merge-recursive-options.sh
index de9ff89d14ff97f1691efee3a670084d4f20a249,29e049af55615fdaa23960e25eb2c2eb9374db58..44f5421be45579b10c5556a958404ad2daa02002
--- 1/t/t3032-merge-recursive-options.sh
--- 2/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@@ -13,16 -13,19 +13,19 @@@ 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
 -                      b inconflict
 +                      b conflict
                " "$@"
        } &&
  

diff --combined t/test-lib.sh
index cb1ca973aa16d82b3c52cc2b7834d977887567a2,aee7d20cf9b026c1ef9386d8094242a4a3fbbe07..42f2f144969a0671b3431f21f659beaff2c53b3d
--- 1/t/test-lib.sh
--- 2/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -260,7 -260,7 +260,7 @@@ test_decode_color () 
                        if (n == 47) return "BWHITE";
                }
                {
 -                      while (match($0, /\x1b\[[0-9;]*m/) != 0) {
 +                      while (match($0, /\033\[[0-9;]*m/) != 0) {
                                printf "%s<", substr($0, 1, RSTART-1);
                                codes = substr($0, RSTART+2, RLENGTH-3);
                                if (length(codes) == 0)
@@@ -1057,6 -1057,13 +1057,13 @@@ case $(uname -s) i
        # backslashes in pathspec are converted to '/'
        # exec does not inherit the PID
        test_set_prereq MINGW
+       test_set_prereq SED_STRIPS_CR
+       ;;
+ *CYGWIN*)
+       test_set_prereq POSIXPERM
+       test_set_prereq EXECKEEPSPID
+       test_set_prereq NOT_MINGW
+       test_set_prereq SED_STRIPS_CR
        ;;
  *)
        test_set_prereq POSIXPERM