merge-ort.c: fix typo 'neeed' to 'needed'

EditFusion · gitster · commit 243c79fdc71a · 2023-10-21T23:13:49.000-07:00
Signed-off-by: 王常新 &lt;wchangxin824@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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.
 	 */

Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,7 @@ static int handle_content_merge(struct merge_options *opt,`
`671`	`671`	`* the three blobs to merge on various sides of history.`
`672`	`672`	`*`
`673`	`673`	`* extra_marker_size is the amount to extend conflict markers in`
`674`		`- * ll_merge; this is neeed if we have content merges of content`
	`674`	`+ * ll_merge; this is needed if we have content merges of content`
`675`	`675`	`* merges, which happens for example with rename/rename(2to1) and`
`676`	`676`	`* rename/add conflicts.`
`677`	`677`	`*/`