From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2018 21:50:43 +0000 (-0700)
Subject: Merge branch 'en/apply-comment-fix'
X-Git-Tag: v2.19.0-rc0~140
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4922a8587b5afa138e2cb3b874e4c7d25957870c?hp=-c

Merge branch 'en/apply-comment-fix'

* en/apply-comment-fix:
apply: fix grammar error in comment
---

4922a8587b5afa138e2cb3b874e4c7d25957870c
diff --combined apply.c
index 23a0f25ded,9ee41ff3eb..49752cde44
--- a/apply.c
+++ 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;