mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 12:59:41 +01:00
Code Activity

Merge branch 'wx/merge-ort-comment-typofix' into maint-2.42

Browse source 
Typofix.

* wx/merge-ort-comment-typofix:
  merge-ort.c: fix typo 'neeed' to 'needed'
This commit is contained in:
Junio C Hamano 2023-11-02 16:53:27 +09:00
commit d373ec0723
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
merge-ort.c
View file

@ -2053,7 +2053,7 @@ static int handle_content_merge(struct merge_options *opt,
* the three blobs to merge on various sides of history. * the three blobs to merge on various sides of history.
* *
* extra_marker_size is the amount to extend conflict markers in * 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 * merges, which happens for example with rename/rename(2to1) and
* rename/add conflicts. * rename/add conflicts.
*/ */