code and test: 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
01689909eb
commit
235e8d5914
@ -1156,9 +1156,9 @@ sub help_patch_cmd {
|
||||
print colored $help_color, <<EOF ;
|
||||
y - $verb this hunk$target
|
||||
n - do not $verb this hunk$target
|
||||
q - quit; do not $verb this hunk nor any of the remaining ones
|
||||
q - quit; do not $verb this hunk or any of the remaining ones
|
||||
a - $verb this hunk and all later hunks in the file
|
||||
d - do not $verb this hunk nor any of the later hunks in the file
|
||||
d - do not $verb this hunk or any of the later hunks in the file
|
||||
g - select a hunk to go to
|
||||
/ - search for a hunk matching the given regex
|
||||
j - leave this hunk undecided, see next undecided hunk
|
||||
|
||||
Reference in New Issue
Block a user