Merge branch 'jl/nor-or-nand-and'

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 7950c4342f81544f719b20add2e1233be36fc718..c1f43108710d950d44b783ce838d65e776c17a4d 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1076,7 +1076,7 @@ static int pbase_tree_cache_ix_incr(int ix)
 static struct pbase_tree {
        struct pbase_tree *next;
        /* This is a phony "cache" entry; we are not
-        * going to evict it nor find it through _get()
+        * going to evict it or find it through _get()
         * mechanism -- this is for the toplevel node that
         * would almost always change with any commit.
         */