Merge branch 'en/apply-comment-fix'
* en/apply-comment-fix: apply: fix grammar error in comment
This commit is contained in:
commit
4922a8587b
2
apply.c
2
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;
|
||||
|
Loading…
Reference in New Issue
Block a user