From: Matthew Hughes Date: Tue, 7 Jan 2025 21:24:21 +0000 (+0000) Subject: docs: fix typesetting of merge driver placeholders X-Git-Tag: v2.49.0-rc0~93^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a63995335e7a941d34bdafb93a56f789ebeed75;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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` ^^^^^^^^^^^^^^^^^^^^^^