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>
Johan Herland committed
Sep 4, 2008 at 23:48 UTC
3407a7a9e67b165902be85b0807e9ea789b3c67d
1 file changed
+4
-4
Documentation/git-merge.txt
+4
-4
@@ -146,8 +146,8 @@ And here is another line that is cleanly resolved or unmodified.
146
------------
147
148
The area a pair of conflicting changes happened is marked with markers
149
-"<<<<<<", "=======", and ">>>>>>>". The part before the "=======" is
150
-typically your side, and the part after it is typically their side.
149
+"`<<<<<<<`", "`=======`", and "`>>>>>>>`". The part before the "`=======`"
150
+is typically your side, and the part after it is typically their side.
151
152
The default format does not show what the original said in the conflicted
153
area. You cannot tell how many lines are deleted and replaced with the
@@ -173,8 +173,8 @@ Git makes conflict resolution easy.
173
And here is another line that is cleanly resolved or unmodified.
174
------------
175
176
-In addition to the "<<<<<<", "=======", and ">>>>>>>" markers, it uses
177
-another "|||||||" marker that is followed by the original text. You can
176
+In addition to the "`<<<<<<<`", "`=======`", and "`>>>>>>>`" markers, it uses
177
+another "`|||||||`" marker that is followed by the original text. You can
178
tell that the original just stated a fact, and your side simply gave in to
179
that statement and gave up, while the other side tried to have a more
180
positive attitude. You can sometimes come up with a better resolution by