comments: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
e34b272344
commit
01689909eb
@ -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;
|
||||
|
@ -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
|
||||
#
|
||||
|
Reference in New Issue
Block a user