diff options
| author | Matthew Hughes <matthewhughes934@gmail.com> | 2025-01-07 22:24:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-08 00:11:36 +0100 |
| commit | 6a63995335e7a941d34bdafb93a56f789ebeed75 (patch) | |
| tree | 04a7ad74caa03430fefda43b8f06256099c46319 /Documentation/gitattributes.txt | |
| parent | Git 2.46.2 (diff) | |
| download | git-6a63995335e7a941d34bdafb93a56f789ebeed75.tar.xz git-6a63995335e7a941d34bdafb93a56f789ebeed75.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | Documentation/gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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` ^^^^^^^^^^^^^^^^^^^^^^ |