Add -y/--no-prompt option to mergetool

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 1c857cf4ab6e359d7009d2c6b5018bb61c916e93..561ae7d0a6ddf9531a8770e54beb43a38fe2aab1 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-send-email'
+test_description='git send-email'
 . ./test-lib.sh
 
 PROG='git send-email'
@@ -109,7 +109,7 @@ test_expect_success 'allow long lines with --no-validate' '
                --from="Example <nobody@example.com>" \
                --to=nobody@example.com \
                --smtp-server="$(pwd)/fake.sendmail" \
-               --no-validate \
+               --novalidate \
                $patches longline.patch \
                2>errors
 '