diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-21 08:44:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-21 08:44:55 -0800 |
| commit | 73c152e6106c3ead1f15f920f4b4f4c38fbfcdb3 (patch) | |
| tree | a41389b7fbfd901e342d9316411f89002dc2f7f2 | |
| parent | c032b1d8bc29de4fb1322d841d8216ca961dcb53 (diff) | |
| parent | 6a63995335e7a941d34bdafb93a56f789ebeed75 (diff) | |
| download | git-73c152e6106c3ead1f15f920f4b4f4c38fbfcdb3.tar.gz | |
Merge branch 'mh/gitattr-doc-markup-fix'
Doc markup fix.
* mh/gitattr-doc-markup-fix:
docs: fix typesetting of merge driver placeholders
| -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` ^^^^^^^^^^^^^^^^^^^^^^ |