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

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index d098a01ba30fa08ae696085164e7b77453f8715a..561ae7d0a6ddf9531a8770e54beb43a38fe2aab1 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -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
 '