Merge branch 'js/test-help-format-windows-port-fix'

* js/test-help-format-windows-port-fix:
  t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html

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
 '