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

Typofix. * wx/merge-ort-comment-typofix: merge-ort.c: fix typo 'neeed' to 'needed'
git · Oct 24, 2023 · d5fbc0a · d5fbc0a
2 parents 44b86d0 + 243c79f
commit d5fbc0a
Showing 1 changed file with 1 addition and 1 deletion.
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.
 	 */