summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2008-09-04 21:48:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-04 22:14:17 (GMT)
commit3407a7a9e67b165902be85b0807e9ea789b3c67d (patch)
tree351fd08f956262a01a7721288e2d780fc926fc77 /Documentation/git-checkout.txt
parent70a3f89733a4cd21631690ba980598fea2249067 (diff)
downloadgit-3407a7a9e67b165902be85b0807e9ea789b3c67d.zip
git-3407a7a9e67b165902be85b0807e9ea789b3c67d.tar.gz
git-3407a7a9e67b165902be85b0807e9ea789b3c67d.tar.bz2
Fix AsciiDoc errors in merge documentation
In the section on conflict markers, the "<<<<<<<" sequence is compiled by AsciiDoc into invalid XML. A way to resolve this is by inserting something between the last two characters in that sequence (i.e. between '<' and '"'). This patch encloses the conflict markers in backticks, which renders them in a monospace font (in the HTML version; the manual page is unaffected), and with the pleasant side-effect that it also fixes the AsciiDoc compile problem. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-checkout.txt')
0 files changed, 0 insertions, 0 deletions