Re: [PATCH] git-merge-tree.txt: replace spurious HTML entity

From: Elijah Newren <newren@gmail.com>
Date: Mar 4, 2023, 21:50 UTC
Message-ID: <CABPp-BEEDS=v7ouOKts83OFMxDq=F0TKO1XvHEbnmXJ+Z1WELA@mail.gmail.com>
In-Reply-To: <87y1oco3i9.fsf@igel.home>

On Sat, Mar 4, 2023 at 9:48 AM Andreas Schwab <schwab@linux-m68k.org> wrote:

Show 17 quoted lines

>
> 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
> -     &lt;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)

I'm sure I'm the one who put it there, but I don't remember any details. I think it unlikely I would have jumped to '<' without trying '<' and hitting an error first, though maybe I really did. Also, there could have been other edits since then; perhaps this was only needed when other characters appeared later on the line? Or maybe the '<' is only needed by asciidoc and not asciidoctor (or vice versa; I have no clue which I was using)? Should we add a "lessthan" field in Documentation/asciidoc.conf under "[attributes]" and use "{lessthan}"?

Or, if this one really is spurious, should the same html entity in Documentation/git-rev-list.txt be expunged as well?

Cc'ing brian who knows way more about asciidoc than I...