aboutsummaryrefslogtreecommitdiff
path: root/perl
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 15:11:46 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-31 15:29:27 -0700
commit01689909eb9f8366583c44b325d8d9ba259a2538 (patch)
tree6a4635a267885b3429f55c81a9a1c8787e36802e /perl
parente34b272344c1e7eb640dcce5990a75460240daed (diff)
downloadgit-01689909eb9f8366583c44b325d8d9ba259a2538.tar.gz
git-01689909eb9f8366583c44b325d8d9ba259a2538.tar.xz
comments: 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')
-rw-r--r--perl/Git/SVN.pm2
-rw-r--r--perl/Git/SVN/Migration.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 6e804a271..62f3293be 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1191,7 +1191,7 @@ sub do_fetch {
# we can have a branch that was deleted, then re-added
# under the same name but copied from another path, in
# which case we'll have multiple parents (we don't
- # want to break the original ref, nor lose copypath info):
+ # want to break the original ref or lose copypath info):
if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
push @{$log_entry->{parents}}, $lc;
return $log_entry;
diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm
index 30daf3546..cf6ffa758 100644
--- a/perl/Git/SVN/Migration.pm
+++ b/perl/Git/SVN/Migration.pm
@@ -1,6 +1,6 @@
package Git::SVN::Migration;
# these version numbers do NOT correspond to actual version numbers
-# of git nor git-svn. They are just relative.
+# of git or git-svn. They are just relative.
#
# v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
#