Merge branch 'wx/merge-ort-comment-typofix'

gitster · gitster · commit 9a48da7843c6 · 2023-10-30T07:09:58.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
@@ -2037,7 +2037,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
`@@ -2037,7 +2037,7 @@ static int handle_content_merge(struct merge_options *opt,`
`2037`	`2037`	`* the three blobs to merge on various sides of history.`
`2038`	`2038`	`*`
`2039`	`2039`	`* extra_marker_size is the amount to extend conflict markers in`
`2040`		`- * ll_merge; this is neeed if we have content merges of content`
	`2040`	`+ * ll_merge; this is needed if we have content merges of content`
`2041`	`2041`	`* merges, which happens for example with rename/rename(2to1) and`
`2042`	`2042`	`* rename/add conflicts.`
`2043`	`2043`	`*/`