summaryrefslogtreecommitdiff
path: root/perl/Git
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 22:11:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-31 22:29:33 (GMT)
commit235e8d591480d7e1378c27fe65c5529625d4b5be (patch)
treeecfd18463fa83687c6926852b373d8040d403234 /perl/Git
parent01689909eb9f8366583c44b325d8d9ba259a2538 (diff)
downloadgit-235e8d591480d7e1378c27fe65c5529625d4b5be.zip
git-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.gz
git-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.bz2
code and test: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl/Git')
-rw-r--r--perl/Git/SVN.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 62f3293..a59564f 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -480,8 +480,8 @@ sub refname {
# It cannot end with a slash /, we'll throw up on this because
# SVN can't have directories with a slash in their name, either:
if ($refname =~ m{/$}) {
- die "ref: '$refname' ends with a trailing slash, this is ",
- "not permitted by git nor Subversion\n";
+ die "ref: '$refname' ends with a trailing slash; this is ",
+ "not permitted by git or Subversion\n";
}
# It cannot have ASCII control character space, tilde ~, caret ^,