| commit | 3407a7a9e67b165902be85b0807e9ea789b3c67d | |
| author | Johan Herland <johan@herland.net> | |
| Thu, 4 Sep 2008 21:48:48 +0000 (4 23:48 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 4 Sep 2008 22:14:17 +0000 (4 15:14 -0700) | ||
| tree | 351fd08f956262a01a7721288e2d780fc926fc77 | treesnapshot (tar.gz zip) |
| parent | 70a3f89733a4cd21631690ba980598fea2249067 | commitdiff |
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>
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>
| Documentation/git-merge.txt | diffblobblamehistory |