mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 19:26:10 +02:00
Code

Merge branch 'en/apply-comment-fix' 

* en/apply-comment-fix:
  apply: fix grammar error in comment
This commit is contained in:
Junio C Hamano 2018-07-24 14:50:43 -07:00
parent 0ce5a698c6 59caacab2a
commit 4922a8587b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apply.c
View File

@ -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;