Merge branch 'wx/merge-ort-comment-typofix' into maint-2.42

gitster · gitster · commit d373ec0723d4 · 2023-11-02T16:53:27.000+09:00
Typofix.

* wx/merge-ort-comment-typofix:
  merge-ort.c: fix typo 'neeed' to 'needed'
diff --git a/merge-ort.c b/merge-ort.c
@@ -2053,7 +2053,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
`@@ -2053,7 +2053,7 @@ static int handle_content_merge(struct merge_options *opt,`
`2053`	`2053`	`* the three blobs to merge on various sides of history.`
`2054`	`2054`	`*`
`2055`	`2055`	`* extra_marker_size is the amount to extend conflict markers in`
`2056`		`- * ll_merge; this is neeed if we have content merges of content`
	`2056`	`+ * ll_merge; this is needed if we have content merges of content`
`2057`	`2057`	`* merges, which happens for example with rename/rename(2to1) and`
`2058`	`2058`	`* rename/add conflicts.`
`2059`	`2059`	`*/`