summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2010-01-26 23:08:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-26 23:16:54 (GMT)
commit9524cf29930b4f91d68ad1384d7f984393a54c15 (patch)
treefec23ec235813a482b7d3d9e2bf187c9ddd8b2ef /t/t6023-merge-file.sh
parent24072c0256a520408575416fe8706667b576ff99 (diff)
downloadgit-9524cf29930b4f91d68ad1384d7f984393a54c15.zip
git-9524cf29930b4f91d68ad1384d7f984393a54c15.tar.gz
git-9524cf29930b4f91d68ad1384d7f984393a54c15.tar.bz2
fix portability issues with $ in double quotes
Using a dollar sign in double quotes isn't portable. Escape them with a backslash or replace the double quotes with single quotes. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
-rwxr-xr-xt/t6023-merge-file.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 7dcf391..6291307 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -146,8 +146,8 @@ test_expect_success 'binary files cannot be merged' '
grep "Cannot merge binary files" merge.err
'
-sed -e "s/deerit.$/deerit;/" -e "s/me;$/me./" < new5.txt > new6.txt
-sed -e "s/deerit.$/deerit,/" -e "s/me;$/me,/" < new5.txt > new7.txt
+sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" < new5.txt > new6.txt
+sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" < new5.txt > new7.txt
test_expect_success 'MERGE_ZEALOUS simplifies non-conflicts' '