t5505: remove unnecessary subshell invocations
[gitweb.git] / t / t6023-merge-file.sh
index 6291307cd03e4e374e640dc82ddc8f26dbb8ff1d..d605024cf8d5375a2cd321e5541256c7fe23556a 100755 (executable)
@@ -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"