X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6023-merge-file.sh;h=d605024cf8d5375a2cd321e5541256c7fe23556a;hb=b7e7f6fb0005f861ca8aed80473a9809d646c403;hp=7dcf39191476f272431e19e10ebb299d6aa55bb1;hpb=8fb5d44a47dd3657c8be0de5dcf220935b04e98e;p=git.git

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 7dcf39191..d605024cf 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -64,6 +64,10 @@ cp new1.txt test.txt
 test_expect_success "merge without conflict" \
 	"git merge-file test.txt orig.txt new2.txt"
 
+cp new1.txt test.txt
+test_expect_success "merge without conflict (--quiet)" \
+	"git merge-file --quiet test.txt orig.txt new2.txt"
+
 cp new1.txt test2.txt
 test_expect_success "merge without conflict (missing LF at EOF)" \
 	"git merge-file test2.txt orig.txt new2.txt"
@@ -146,8 +150,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' '