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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index e6150595af8210c1abc871b73cc78cbdfdeaeee7..5d12b785491fba165d285b22dc41ff78dd2fdee0 100644 (file)
--- 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`
 ^^^^^^^^^^^^^^^^^^^^^^