diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3032-merge-recursive-options.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh index 229379755..f70f6c4da 100755 --- 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 |