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=0ce5a698c6f775c2cc18de9eb62d558b1b85d752

Merge branch 'en/apply-comment-fix'

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

diff --git a/apply.c b/apply.c
index 23a0f25ded..49752cde44 100644
--- a/apply.c
+++ b/apply.c
@@ -4056,7 +4056,7 @@ static int preimage_oid_in_gitlink_patch(struct patch *p, struct object_id *oid)
 	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;