* 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
. ./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