summaryrefslogtreecommitdiff
path: root/t/t3032-merge-recursive-options.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-01-13 19:35:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-01-13 19:35:28 (GMT)
commit7810c6b6d6cf91d624216623e2327d7cb63c1c92 (patch)
tree373142243f3fedca26f5bcf566692eb3f0745587 /t/t3032-merge-recursive-options.sh
parent37ee62bc6b60b566e39c8ea9fbf34b23a9a39d2f (diff)
parent5b5d53cbe5d67bd86543a4851014fde0837d1344 (diff)
downloadgit-7810c6b6d6cf91d624216623e2327d7cb63c1c92.zip
git-7810c6b6d6cf91d624216623e2327d7cb63c1c92.tar.gz
git-7810c6b6d6cf91d624216623e2327d7cb63c1c92.tar.bz2
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
Diffstat (limited to 't/t3032-merge-recursive-options.sh')
-rwxr-xr-xt/t3032-merge-recursive-options.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index de9ff89..44f5421 100755
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -13,9 +13,12 @@ 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 -n -e "
+ sed $SED_OPTIONS -n -e "
/^<<<</ b conflict
b
: conflict