From: Junio C Hamano Date: Sun, 9 Jan 2011 07:49:15 +0000 (-0800) Subject: Merge branch 'rj/test-fixes' into next X-Git-Tag: ko-next~21 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=37ef4565b370f6fb2656650e0a93ca99242322d6;p=git.git 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 --- 37ef4565b370f6fb2656650e0a93ca99242322d6 diff --cc t/t3032-merge-recursive-options.sh index adc72840d,29e049af5..44f5421be --- a/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 n