Merge branch 'en/apply-comment-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:43 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:43 +0000 (14:50 -0700)
* en/apply-comment-fix:
apply: fix grammar error in comment

1  2 
apply.c
diff --combined apply.c
index 23a0f25ded853c29c3a6e891399dc5c1c2d8a753,9ee41ff3eb0b2d916c819e9c6b8d98d3f010a194..49752cde44df6f0853051abacf8546ab92ee4d7a
+++ b/apply.c
@@@ -9,7 -9,6 +9,7 @@@
  
  #include "cache.h"
  #include "config.h"
 +#include "object-store.h"
  #include "blob.h"
  #include "delta.h"
  #include "diff.h"
@@@ -4056,7 -4055,7 +4056,7 @@@ static int preimage_oid_in_gitlink_patc
        return get_oid_hex(p->old_sha1_prefix, oid);
  }
  
- /* Build an index that contains the just the files needed for a 3way merge */
+ /* Build an index that contains just the files needed for a 3way merge */
  static int build_fake_ancestor(struct apply_state *state, struct patch *list)
  {
        struct patch *patch;