From 243c79fdc71ada665715255e5f49cc35dca0c560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=B8=E6=96=B0?= Date: Sun, 22 Oct 2023 02:46:08 +0000 Subject: merge-ort.c: fix typo 'neeed' to 'needed' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王常新 Signed-off-by: Junio C Hamano --- merge-ort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge-ort.c') 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. */ -- cgit v1.2.3