diff options
| author |  Johan Herland <johan@herland.net> | 2008-09-04 23:48:48 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-09-04 15:14:17 -0700 |
| commit | 3407a7a9e67b165902be85b0807e9ea789b3c67d (patch) | |
| tree | 351fd08f956262a01a7721288e2d780fc926fc77 /Documentation/git-apply.txt | |
| parent | git-merge documentation: describe how conflict is presented (diff) | |
| download | tgif-3407a7a9e67b165902be85b0807e9ea789b3c67d.tar.xz | |
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-apply.txt')
0 files changed, 0 insertions, 0 deletions