# [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c 3 messages from 2023-10-15 to 2023-10-22. Participants: Wangchangxin via GitGitGadget. Thread: https://gitlist.dev/t/60369 ## Wangchangxin via GitGitGadget, 2023-10-15 14:08 Subject: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c Message-ID: URL: https://gitlist.dev/e/pull.1592.git.git.1697378928693.gitgitgadget%40gmail.com ``` From: foril <1571825323@qq.com> Signed-off-by: 王常新 (Wang Changxin) --- 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-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1592/foriLLL/comment_patch-v1 Pull-Request: https://github.com/git/git/pull/1592 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 ``` ## Wangchangxin via GitGitGadget, 2023-10-19 12:40 Subject: [PATCH v2] merge-ort.c: fix typo 'neeed' to 'needed' Message-ID: URL: https://gitlist.dev/e/pull.1592.v2.git.git.1697719216137.gitgitgadget%40gmail.com In-Reply-To: ``` From: foril <1571825323@qq.com> Signed-off-by: 王常新 (Wang Changxin) --- 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-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1592/foriLLL/comment_patch-v2 Pull-Request: https://github.com/git/git/pull/1592 Range-diff vs v1: 1: 737eccd2811 ! 1: 3934ee6b684 typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c @@ Metadata Author: foril <1571825323@qq.com> ## Commit message ## - typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c + merge-ort.c: fix typo 'neeed' to 'needed' Signed-off-by: 王常新 (Wang Changxin) 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 ``` ## Wangchangxin via GitGitGadget, 2023-10-22 02:46 Subject: [PATCH v3] merge-ort.c: fix typo 'neeed' to 'needed' Message-ID: URL: https://gitlist.dev/e/pull.1592.v3.git.git.1697942768555.gitgitgadget%40gmail.com In-Reply-To: ``` From: =?UTF-8?q?=E7=8E=8B=E5=B8=B8=E6=96=B0?= Signed-off-by: 王常新 (Wang Changxin) --- 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 <1571825323@qq.com> +Author: 王常新 ## Commit message ## merge-ort.c: fix typo 'neeed' to 'needed' - Signed-off-by: 王常新 (Wang Changxin) + Signed-off-by: 王常新 (Wang Changxin) ## 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 ```