Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-06-07 08:05:25 +0300
committerJunio C Hamano <gitster@pobox.com>2018-06-28 23:27:57 +0300
commit59caacab2af42ab28956a0cdf0489155471f6a18 (patch)
tree9222888485abe0ca606abdb056936065883dfa13 /apply.c
parente3331758f12da22f4103eec7efe1b5304a9be5e9 (diff)
apply: fix grammar error in comment
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 959c457910..9ee41ff3eb 100644
--- a/apply.c
+++ b/apply.c
@@ -4055,7 +4055,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;