kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

docs: fix typesetting of merge driver placeholders 

Following the `CodingGuidlines`, since these placeholders are literal
they should be typeset verbatim, so fix some that aren't.

Signed-off-by: Matthew Hughes <matthewhughes934@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Matthew Hughes 2025-01-07 21:24:21 +00:00 committed by Junio C Hamano
parent 4f71522dfb
commit 6a63995335
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/gitattributes.txt
View File

@ -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`
^^^^^^^^^^^^^^^^^^^^^^