summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 22:11:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-31 22:29:33 (GMT)
commit235e8d591480d7e1378c27fe65c5529625d4b5be (patch)
treeecfd18463fa83687c6926852b373d8040d403234 /sha1_file.c
parent01689909eb9f8366583c44b325d8d9ba259a2538 (diff)
downloadgit-235e8d591480d7e1378c27fe65c5529625d4b5be.zip
git-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.gz
git-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.bz2
code and test: fix misuses of "nor"
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index b79efe4..77dbb56 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";