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-merge.txt | |
| parent | 70a3f89733a4cd21631690ba980598fea2249067 (diff) | |
| download | git-3407a7a9e67b165902be85b0807e9ea789b3c67d.tar.gz | |
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-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 8065d17781..18750467d8 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -146,8 +146,8 @@ And here is another line that is cleanly resolved or unmodified. ------------ The area a pair of conflicting changes happened is marked with markers -"<<<<<<", "=======", and ">>>>>>>". The part before the "=======" is -typically your side, and the part after it is typically their side. +"`<<<<<<<`", "`=======`", and "`>>>>>>>`". The part before the "`=======`" +is typically your side, and the part after it is typically their side. The default format does not show what the original said in the conflicted area. You cannot tell how many lines are deleted and replaced with the @@ -173,8 +173,8 @@ Git makes conflict resolution easy. And here is another line that is cleanly resolved or unmodified. ------------ -In addition to the "<<<<<<", "=======", and ">>>>>>>" markers, it uses -another "|||||||" marker that is followed by the original text. You can +In addition to the "`<<<<<<<`", "`=======`", and "`>>>>>>>`" markers, it uses +another "`|||||||`" marker that is followed by the original text. You can tell that the original just stated a fact, and your side simply gave in to that statement and gave up, while the other side tried to have a more positive attitude. You can sometimes come up with a better resolution by |