contrib: 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:
Justin Lebar 2014-03-31 15:11:45 -07:00 committed by Junio C Hamano
parent a58088abe2
commit e34b272344
2 changed files with 3 additions and 3 deletions

View file

@ -280,7 +280,7 @@ case "$#,$also,$only,$amend" in
0,,,*)
;;
*,,,*)
only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
only_include_assumed="# Explicit paths specified without -i or -o; assuming --only paths..."
also=
;;
esac

View file

@ -40,8 +40,8 @@ manual page.
NOTES
-----
Subversion dumps do not record a separate author and committer for
each revision, nor a separate display name and email address for
each author. Like git-svn(1), 'svn-fe' will use the name
each revision, nor do they record a separate display name and email
address for each author. Like git-svn(1), 'svn-fe' will use the name
---------
user <user@UUID>