summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-07-24 21:50:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-24 21:50:43 (GMT)
commit4922a8587b5afa138e2cb3b874e4c7d25957870c (patch)
treea01d436464fcacd2f2223bf72394dc66a4fc993f /apply.c
parent0ce5a698c6f775c2cc18de9eb62d558b1b85d752 (diff)
parent59caacab2af42ab28956a0cdf0489155471f6a18 (diff)
downloadgit-4922a8587b5afa138e2cb3b874e4c7d25957870c.zip
git-4922a8587b5afa138e2cb3b874e4c7d25957870c.tar.gz
git-4922a8587b5afa138e2cb3b874e4c7d25957870c.tar.bz2
Merge branch 'en/apply-comment-fix'
* en/apply-comment-fix: apply: fix grammar error in comment
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 23a0f25..49752cd 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;