development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix AsciiDoc errors in merge documentation

Browse source 
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>
This commit is contained in:
Johan Herland 2008-09-04 23:48:48 +02:00 committed by Junio C Hamano
parent 70a3f89733
commit 3407a7a9e6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Documentation/git-merge.txt
View file

@ -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