diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-07-25 00:50:43 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-25 00:50:43 +0300 |
commit | 4922a8587b5afa138e2cb3b874e4c7d25957870c (patch) | |
tree | a01d436464fcacd2f2223bf72394dc66a4fc993f /apply.c | |
parent | 0ce5a698c6f775c2cc18de9eb62d558b1b85d752 (diff) | |
parent | 59caacab2af42ab28956a0cdf0489155471f6a18 (diff) |
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; |