diff options
author | Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:29:27 -0700 |
commit | 01689909eb9f8366583c44b325d8d9ba259a2538 (patch) | |
tree | 6a4635a267885b3429f55c81a9a1c8787e36802e /diff.c | |
parent | e34b272344c1e7eb640dcce5990a75460240daed (diff) | |
download | git-01689909eb9f8366583c44b325d8d9ba259a2538.tar.gz |
comments: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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') |