Merge branch 'ps/chainlint-self-check-update' into maint-2.43

[thirdparty/git.git] / merge-ort.c

diff --git a/merge-ort.c b/merge-ort.c
index 36537256613b5d18aff7b4b0d6e45ca7b921d146..6491070d965835f9202b68fbdae72cb6cd6c987f 100644 (file)
--- 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.
         */