diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:43 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:43 -0700 |
commit | 4922a8587b5afa138e2cb3b874e4c7d25957870c (patch) | |
tree | a01d436464fcacd2f2223bf72394dc66a4fc993f /apply.c | |
parent | Merge branch 'en/rebase-consistency' (diff) | |
parent | apply: fix grammar error in comment (diff) | |
download | tgif-4922a8587b5afa138e2cb3b874e4c7d25957870c.tar.xz |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |