From 01689909eb9f8366583c44b325d8d9ba259a2538 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Mon, 31 Mar 2014 15:11:46 -0700 Subject: comments: fix misuses of "nor" Signed-off-by: Justin Lebar Signed-off-by: Junio C Hamano --- diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'diff.c') diff --git a/diff.c b/diff.c index 1cd4672d0..635dee244 100644 --- a/diff.c +++ b/diff.c @@ -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') -- cgit v1.2.1