X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6023-merge-file.sh;h=d605024cf8d5375a2cd321e5541256c7fe23556a;hb=b7e7f6fb0005f861ca8aed80473a9809d646c403;hp=6291307cd03e4e374e640dc82ddc8f26dbb8ff1d;hpb=712d352577012d5035da69bbf49ea0f0df8bb7da;p=git.git

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