From: Andreas Schwab <schwab@linux-m68k.org>
To: git@vger.kernel.org
Subject: [PATCH] git-merge-tree.txt: replace spurious HTML entity
Date: Sat, 04 Mar 2023 18:00:46 +0100 [thread overview]
Message-ID: <87y1oco3i9.fsf@igel.home> (raw)
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
---
Documentation/git-merge-tree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index 88ee942101..ffc4fbf7e8 100644
--- a/Documentation/git-merge-tree.txt
+++ b/Documentation/git-merge-tree.txt
@@ -108,7 +108,7 @@ This is an integer status followed by a NUL character. The integer status is:
0: merge had conflicts
1: merge was clean
- <0: something prevented the merge from running (e.g. access to repository
+ <0: something prevented the merge from running (e.g. access to repository
objects denied by filesystem)
[[OIDTLT]]
--
2.39.1
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
next reply other threads:[~2023-03-04 17:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-04 17:00 Andreas Schwab [this message]
2023-03-04 21:50 ` [PATCH] git-merge-tree.txt: replace spurious HTML entity Elijah Newren
2023-03-05 0:43 ` Felipe Contreras
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=87y1oco3i9.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
/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.