Subject: Re: [PATCH] docs: fix typesetting of merge driver placeholders

From: Junio C Hamano <[email-masked]>
Date: Tue, 07 Jan 2025 15:11:01 -0800

Matthew Hughes <[email-masked]> writes:

> Following the `CodingGuidlines`, since these placeholders are literal
> they should be typeset verbatim, so fix some that aren't.
>
> Signed-off-by: Matthew Hughes <[email-masked]>
> ---
>  Documentation/gitattributes.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Yup, especially the %P placeholder uses the backquote/literal
mark-up already in a few lines above, this is an obviously right
thing to do.

Will queue.  Thanks.

>
> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
> index e6150595af..5d12b78549 100644
> --- a/Documentation/gitattributes.txt
> +++ b/Documentation/gitattributes.txt
> @@ -1166,7 +1166,7 @@ internal merge and the final merge.
>  The merge driver can learn the pathname in which the merged result
>  will be stored via placeholder `%P`. The conflict labels to be used
>  for the common ancestor, local head and other head can be passed by
> -using '%S', '%X' and '%Y` respectively.
> +using `%S`, `%X` and `%Y` respectively.
>  
>  `conflict-marker-size`
>  ^^^^^^^^^^^^^^^^^^^^^^
>
> base-commit: 14650065b76b28d3cfa9453356ac5669b19e706e