summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-11-01 07:38:51 -0700
committerJunio C Hamano <gitster@pobox.com>2013-11-01 07:38:51 -0700
commitcbe59df99a69069e438aa1d6444036b9cc5d64a2 (patch)
tree4452fc170d4262c7328575a5d0df577d9b03a9d7
parent1feb458fb956cc8991267b00f33b91766dfadaad (diff)
parent01e8d327a9d647c1e891920365c5f6b4f595d5e9 (diff)
downloadgit-cbe59df99a69069e438aa1d6444036b9cc5d64a2.tar.gz
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
-rwxr-xr-xt/t3200-branch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 0fe7647928..fcdb867748 100755
--- 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
'