]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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

apply.c

diff --git a/apply.c b/apply.c
index 23a0f25ded853c29c3a6e891399dc5c1c2d8a753..49752cde44df6f0853051abacf8546ab92ee4d7a 100644 (file)
--- 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;