Message ID | pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 243c79fdc71ada665715255e5f49cc35dca0c560 |
Headers | show |
Series | [v3] merge-ort.c: fix typo 'neeed' to 'needed' | expand |
diff --git a/merge-ort.c b/merge-ort.c index 7857ce9fbd1..aee6f7d8173 100644 --- 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. */