From: "Wangchangxin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Wangchangxin <wchangxin824@163.com>, 王常新 <wchangxin824@gmail.com>
Subject: [PATCH v3] merge-ort.c: fix typo 'neeed' to 'needed'
Date: Sun, 22 Oct 2023 02:46:08 +0000 [thread overview]
Message-ID: <pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1592.v2.git.git.1697719216137.gitgitgadget@gmail.com>
From: =?UTF-8?q?=E7=8E=8B=E5=B8=B8=E6=96=B0?= <wchangxin824@gmail.com>
Signed-off-by: 王常新 (Wang Changxin) <wchangxin824@gmail.com>
---
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: 王常新 <wchangxin824@gmail.com>
## Commit message ##
merge-ort.c: fix typo 'neeed' to 'needed'
- Signed-off-by: 王常新 (Wang Changxin) <foril@foril.space>
+ Signed-off-by: 王常新 (Wang Changxin) <wchangxin824@gmail.com>
## 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
prev parent reply other threads:[~2023-10-22 2:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-15 14:08 [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c Wangchangxin via GitGitGadget
2023-10-19 12:40 ` [PATCH v2] merge-ort.c: fix typo 'neeed' to 'needed' Wangchangxin via GitGitGadget
2023-10-22 2:46 ` Wangchangxin via GitGitGadget [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=wchangxin824@163.com \
--cc=wchangxin824@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.