sha1_file: add the ability to parse objects in "pack file format"

diff --git a/combine-diff.c b/combine-diff.c
index caffb926ea49de03c4ced157736626719439a756..1bc1484645b4021ee71415f3b3ed44e4c88030d6 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -320,7 +320,7 @@ static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
        unsigned long i;
 
        /* Two groups of interesting lines may have a short gap of
-        * unintersting lines.  Connect such groups to give them a
+        * uninteresting lines.  Connect such groups to give them a
         * bit of context.
         *
         * We first start from what the interesting() function says,