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>
Matthew Hughes committed
Jan 7, 2025 at 21:24 UTC
6a63995335e7a941d34bdafb93a56f789ebeed75
1 file changed
+1
-1
Documentation/gitattributes.txt
+1
-1
@@ -1166,7 +1166,7 @@ internal merge and the final merge.
1166
The merge driver can learn the pathname in which the merged result
1167
will be stored via placeholder `%P`. The conflict labels to be used
1168
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.
1170
1171
`conflict-marker-size`
1172
^^^^^^^^^^^^^^^^^^^^^^