Merge branch 'maint'

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index d9420e0a3b611c8aa8bb3a64d1bb21859d4a87ff..ce26ea4ac53a4608f6f8234b67868a9cc85be7f8 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -616,7 +616,7 @@ test_expect_success 'in-reply-to but no threading' '
                --from="Example <nobody@example.com>" \
                --to=nobody@example.com \
                --in-reply-to="<in-reply-id@example.com>" \
-               --no-thread \
+               --nothread \
                $patches |
        grep "In-Reply-To: <in-reply-id@example.com>"
 '