tests: document cherry-pick behavior in face of conflicts

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 9c5ef68d8cc9eb3fcb12a6d376affe6f307986ee..5034dd1352c275beca4d5dae805cad6573a89aca 100755 (executable)
--- 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"