Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
[gitweb.git]
/
t
/
t3032-merge-recursive-options.sh
diff --git
a/t/t3032-merge-recursive-options.sh
b/t/t3032-merge-recursive-options.sh
index 2293797553d49c5221da10ca17f97eeba1f5d29d..f70f6c4da40a6455ff2e66ee53e8cc6a262c4787 100755
(executable)
--- a/
t/t3032-merge-recursive-options.sh
+++ b/
t/t3032-merge-recursive-options.sh
@@
-13,9
+13,11
@@
test_description='merge-recursive options
. ./test-lib.sh
+test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
+
test_expect_success 'setup' '
conflict_hunks () {
- sed -n -e "
+ sed
$SED_OPTIONS
-n -e "
/^<<<</ b inconflict
b
: inconflict