Subject: [PATCH v3] merge-ort.c: fix typo 'neeed' to 'needed'

From: "Wangchangxin via GitGitGadget" <[email-masked]>
Date: Sun, 22 Oct 2023 02:46:08 +0000

From: =?UTF-8?q?=E7=8E=8B=E5=B8=B8=E6=96=B0?= <[email-masked]>

Signed-off-by: 王常新 (Wang Changxin) <[email-masked]>
---
    typo: fix the typo 'neeed' into 'needed' in the comment under merge-o…
    
    the comments on line 2039 under merge-ort.c should be :
    this is needed if we have content merges of content merges rather than
    this is neeed if we have content merges of content merges
    
    fix the typo

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1592%2FforiLLL%2Fcomment_patch-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1592/foriLLL/comment_patch-v3
Pull-Request: https://github.com/git/git/pull/1592

Range-diff vs v2:

 1:  3934ee6b684 ! 1:  9320154b91a merge-ort.c: fix typo 'neeed' to 'needed'
     @@
       ## Metadata ##
     -Author: foril <[email-masked]>
     +Author: 王常新 <[email-masked]>
      
       ## Commit message ##
          merge-ort.c: fix typo 'neeed' to 'needed'
      
     -    Signed-off-by: 王常新 (Wang Changxin) <[email-masked]>
     +    Signed-off-by: 王常新 (Wang Changxin) <[email-masked]>
      
       ## merge-ort.c ##
      @@ merge-ort.c: static int handle_content_merge(struct merge_options *opt,

 merge-ort.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.
 	 */

base-commit: a9ecda2788e229afc9b611acaa26d0d9d4da53ed
-- 
gitgitgadget