diff options
author | Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:47 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:29:33 -0700 |
commit | 235e8d591480d7e1378c27fe65c5529625d4b5be (patch) | |
tree | ecfd18463fa83687c6926852b373d8040d403234 /sha1_file.c | |
parent | 01689909eb9f8366583c44b325d8d9ba259a2538 (diff) | |
download | git-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.gz |
code and test: fix misuses of "nor"jl/nor-or-nand-and
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
-rw-r--r-- | sha1_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index b79efe431e..77dbb56946 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1123,7 +1123,7 @@ static void report_helper(const struct string_list *list, const char *msg; switch (seen_bits) { case 0: - msg = "no corresponding .idx nor .pack"; + msg = "no corresponding .idx or .pack"; break; case 1: msg = "no corresponding .idx"; |