diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-30 01:09:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-30 01:09:58 +0300 |
| commit | 9a48da7843c6a160d88c75dfbad96ccc81ce3fe1 (patch) | |
| tree | b7b38622f5359b124744badbd352451b9f592c94 /merge-ort.c | |
| parent | 39072d24967ec88deec7f46bc0d382d01ec28a0d (diff) | |
| parent | 243c79fdc71ada665715255e5f49cc35dca0c560 (diff) | |
Merge branch 'wx/merge-ort-comment-typofix'
Typofix.
* wx/merge-ort-comment-typofix:
merge-ort.c: fix typo 'neeed' to 'needed'
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index 3653725661..6491070d96 100644 --- 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. */ |