merge-ort.c: fix typo 'neeed' to 'needed'
Signed-off-by: 王常新 <wchangxin824@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
王常新 committed
Oct 22, 2023 at 02:46 UTC
243c79fdc71ada665715255e5f49cc35dca0c560
1 file changed
+1
-1
merge-ort.c
+1
-1
@@ -671,7 +671,7 @@ static int handle_content_merge(struct merge_options *opt,
671
* the three blobs to merge on various sides of history.
672
*
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
* merges, which happens for example with rename/rename(2to1) and
676
* rename/add conflicts.
677
*/