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:
Justin Lebar
2014-03-31 15:11:46 -07:00
committed by Junio C Hamano
parent e34b272344
commit 01689909eb
20 changed files with 26 additions and 27 deletions

2
diff.c
View File

@ -3942,7 +3942,7 @@ static int diff_scoreopt_parse(const char *opt)
}
}
if (cmd != 'M' && cmd != 'C' && cmd != 'B')
return -1; /* that is not a -M, -C nor -B option */
return -1; /* that is not a -M, -C, or -B option */
opt1 = parse_rename_score(&opt);
if (cmd != 'B')