merge-ort.c: fix typo 'neeed' to 'needed'

Signed-off-by: 王常新 <wchangxin824@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-ort.c b/merge-ort.c
index 2cfb7ffa3b0d51ec55e439677608bfcec59178e6..609b388453318725432cd17b20ac0bd11c8f40e1 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -671,7 +671,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.
         */