mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/gitattr-doc-markup-fix'

Browse Source 
Doc markup fix.

* mh/gitattr-doc-markup-fix:
  docs: fix typesetting of merge driver placeholders
This commit is contained in:
Junio C Hamano
2025-01-21 08:44:55 -08:00
parent c032b1d8bc 6a63995335
commit 73c152e610
1 changed files with 1 additions and 1 deletions
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 The merge driver can learn the pathname in which the merged result
will be stored via placeholder `%P`. The conflict labels to be used 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 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` `conflict-marker-size`
^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^