summaryrefslogtreecommitdiffstats
path: root/t/t9400-git-cvsserver-server.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-08 21:00:27 +0200
committerJunio C Hamano <gitster@pobox.com>2014-04-08 21:00:28 +0200
commitd59c12d7ad39f942fc60578ba1e934822f40445b (patch)
treef0591d6490164e7a8a672c79094a2d612899cfb7 /t/t9400-git-cvsserver-server.sh
parentMerge branch 'mh/update-ref-batch-create-fix' (diff)
parentcode and test: fix misuses of "nor" (diff)
downloadgit-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.xz
git-d59c12d7ad39f942fc60578ba1e934822f40445b.zip
Merge branch 'jl/nor-or-nand-and'
Eradicate mistaken use of "nor" (that is, essentially "nor" used not in "neither A nor B" ;-)) from in-code comments, command output strings, and documentations. * jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"
Diffstat (limited to 't/t9400-git-cvsserver-server.sh')
-rwxr-xr-xt/t9400-git-cvsserver-server.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index ed98e64477..6146c3fec2 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -511,7 +511,7 @@ test_expect_success 'cvs co -c (shows module database)' '
# Known issues with git-cvsserver current log output:
# - Hard coded "lines: +2 -3" placeholder, instead of real numbers.
# - CVS normally does not internally add a blank first line
-# nor a last line with nothing but a space to log messages.
+# or a last line with nothing but a space to log messages.
# - The latest cvs 1.12.x server sends +0000 timezone (with some hidden "MT"
# tagging in the protocol), and if cvs 1.12.x client sees the MT tags,
# it converts to local time zone. git-cvsserver doesn't do the +0000