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

diff --cc t/t3200-branch.sh
index 0fe7647928b9d20963e60e56009f72c54ee488e2,bc117aaf33f07c9864db754cdf499c32e42937d3..fcdb867748f3c651fdb58c148016f3da1cf2c9be
--- 1/t/t3200-branch.sh
--- 2/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@@ -14,11 -14,10 +14,11 @@@ test_expect_success 'prepare a trivial 
        echo World >>A &&
        git update-index --add A &&
        git commit -m "Second commit." &&
 -      HEAD=$(git rev-parse --verify HEAD)'
 +      HEAD=$(git rev-parse --verify HEAD)
 +'
  
  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
  '