typo: fix the typo 'neeed' into 'needed' in the comment under merge-o…

…rt.c Signed-off-by: 王常新 (Wang Changxin) <foril@foril.space>
git · Oct 15, 2023 · 737eccd · 737eccd
1 parent a9ecda2
commit 737eccd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/merge-ort.c b/merge-ort.c
@@ -2036,7 +2036,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.
 	 */