Merge branch 'rk/send-email-ssl-cert'

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 0fe7647928b9d20963e60e56009f72c54ee488e2..fcdb867748f3c651fdb58c148016f3da1cf2c9be 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -18,7 +18,7 @@ test_expect_success 'prepare a trivial repository' '
 '
 
 test_expect_success 'git branch --help should not have created a bogus branch' '
-       test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null &&
+       test_might_fail git branch --man --help </dev/null >/dev/null 2>&1 &&
        test_path_is_missing .git/refs/heads/--help
 '