From: 王常新 Date: Sun, 22 Oct 2023 02:46:08 +0000 (+0000) Subject: merge-ort.c: fix typo 'neeed' to 'needed' X-Git-Tag: v2.42.1~3^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=243c79fdc71ada665715255e5f49cc35dca0c560;p=thirdparty%2Fgit.git merge-ort.c: fix typo 'neeed' to 'needed' Signed-off-by: 王常新 Signed-off-by: Junio C Hamano --- diff --git a/merge-ort.c b/merge-ort.c index 2cfb7ffa3b..609b388453 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -671,7 +671,7 @@ static int handle_content_merge(struct merge_options *opt, * the three blobs to merge on various sides of history. * * extra_marker_size is the amount to extend conflict markers in - * ll_merge; this is neeed if we have content merges of content + * ll_merge; this is needed if we have content merges of content * merges, which happens for example with rename/rename(2to1) and * rename/add conflicts. */