Skip to content

Commit 6a63995

Browse files
matthewhughes934gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4f71522 commit 6a63995

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/gitattributes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,7 @@ internal merge and the final merge.
11661166
The merge driver can learn the pathname in which the merged result
11671167
will be stored via placeholder `%P`. The conflict labels to be used
11681168
for the common ancestor, local head and other head can be passed by
1169-
using '%S', '%X' and '%Y` respectively.
1169+
using `%S`, `%X` and `%Y` respectively.
11701170

11711171
`conflict-marker-size`
11721172
^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)