X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6023-merge-file.sh;h=6291307cd03e4e374e640dc82ddc8f26dbb8ff1d;hb=57c118c268a01b00954916e344f2eb082eafaaaf;hp=7dcf39191476f272431e19e10ebb299d6aa55bb1;hpb=cb16bcc36965f28845e4fae15c36280a2506f1be;p=git.git

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 7dcf39191..6291307cd 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' '