diff options
| author | Arjen Laarhoven <arjen@yaph.org> | 2008-09-08 20:29:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-08 14:26:23 -0700 |
| commit | 10708a994a632c392ab58aa7d11e49b322aa1505 (patch) | |
| tree | 6c774edba460f05992a911450031b504ed17f057 /t/t6023-merge-file.sh | |
| parent | bfd083b734fe812b347ee71dca416d2bcfa87480 (diff) | |
| download | git-10708a994a632c392ab58aa7d11e49b322aa1505.tar.gz git-10708a994a632c392ab58aa7d11e49b322aa1505.tar.xz | |
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 <arjen@yaph.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
| -rwxr-xr-x | t/t6023-merge-file.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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' ' |