diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:27 +0900 |
| commit | d373ec0723d4bc6a51e135660a34e27cdfceffe0 (patch) | |
| tree | 782eaeaa5294d0dbb523a79e4b985dd91420ff48 | |
| parent | 8a26aaa91ed5bcb351f83fc00eac8944ec9f1b79 (diff) | |
| parent | 243c79fdc71ada665715255e5f49cc35dca0c560 (diff) | |
| download | git-d373ec0723d4bc6a51e135660a34e27cdfceffe0.tar.gz | |
Merge branch 'wx/merge-ort-comment-typofix' into maint-2.42
Typofix.
* wx/merge-ort-comment-typofix:
merge-ort.c: fix typo 'neeed' to 'needed'
| -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 8631c99700..e5e22e3583 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -2053,7 +2053,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. */ |