summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2011-01-05 18:30:03 -0600
committerJunio C Hamano <gitster@pobox.com>2011-01-06 12:34:52 -0800
commitbc2d159421bb017edc7b8b8d6d5544e1c83073e4 (patch)
treeecc586299d0898dd5d3f79f40470565e5db6bd47 /t
parented40ec551d4517323c6a46aa555b83cc7651ddbc (diff)
downloadgit-bc2d159421bb017edc7b8b8d6d5544e1c83073e4.tar.gz
t3032: limit sed branch labels to 8 characters
POSIX leaves as unspecified the handling of labels greater than 8 characters. Apparently, Sun decided to treat them as errors. Make sed on Solaris happy by trimming the length of labels to 8 characters. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3032-merge-recursive-options.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index 2293797553..de9ff89d14 100755
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -16,13 +16,13 @@ test_description='merge-recursive options
test_expect_success 'setup' '
conflict_hunks () {
sed -n -e "
- /^<<<</ b inconflict
+ /^<<<</ b conflict
b
- : inconflict
+ : conflict
p
/^>>>>/ b
n
- b inconflict
+ b conflict
" "$@"
} &&