From: Arjen Laarhoven Date: Mon, 8 Sep 2008 18:29:18 +0000 (+0200) Subject: t6023-merge-file: Work around non-portable sed usage X-Git-Tag: v1.6.1-rc1~257 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=10708a994a632c392ab58aa7d11e49b322aa1505;p=git.git t6023-merge-file: Work around non-portable sed usage OS X sed doesn't understand '\n' on the right side of a substitution. Use a valid substitution character instead and use 'tr' to convert those to a newline. Signed-off-by: Arjen Laarhoven Signed-off-by: Junio C Hamano --- diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index 42620e073..5e18d68c9 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -150,8 +150,8 @@ test_expect_success 'MERGE_ZEALOUS simplifies non-conflicts' ' ' -sed -e 's/deerit./&\n\n\n\n/' -e "s/locavit,/locavit;/" < new6.txt > new8.txt -sed -e 's/deerit./&\n\n\n\n/' -e "s/locavit,/locavit --/" < new7.txt > new9.txt +sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit;/"< new6.txt | tr '%' '\012' > new8.txt +sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit --/" < new7.txt | tr '%' '\012' > new9.txt test_expect_success 'ZEALOUS_ALNUM' '