Merge branch 'en/apply-comment-fix'

gitster · gitster · commit 4922a8587b5a · 2018-07-24T14:50:43.000-07:00
* en/apply-comment-fix:
  apply: fix grammar error in comment
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -4056,7 +4056,7 @@ static int preimage_oid_in_gitlink_patch(struct patch p, struct object_id oid)`
`4056`	`4056`	`return get_oid_hex(p->old_sha1_prefix, oid);`
`4057`	`4057`	`}`
`4058`	`4058`
`4059`		`-/* Build an index that contains the just the files needed for a 3way merge */`
	`4059`	`+/* Build an index that contains just the files needed for a 3way merge */`
`4060`	`4060`	`static int build_fake_ancestor(struct apply_state state, struct patch list)`
`4061`	`4061`	`{`
`4062`	`4062`	`struct patch *patch;`