diff options
| author | 王常新 <wchangxin824@gmail.com> | 2023-10-22 02:46:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-21 23:13:49 -0700 |
| commit | 243c79fdc71ada665715255e5f49cc35dca0c560 (patch) | |
| tree | be05f6adab3f26d4beabb3a14e22fe546ed391ca | |
| parent | 62fdec17a111e419b750938d24b6d65e3076b76d (diff) | |
| download | git-243c79fdc71ada665715255e5f49cc35dca0c560.tar.gz | |
merge-ort.c: fix typo 'neeed' to 'needed'
Signed-off-by: 王常新 <wchangxin824@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 2cfb7ffa3b..609b388453 100644 --- 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. */ |