[BUG] Problem compiling documentation

Hi!

Trying to compile the documentation from next has failed for me for a while and now I got to the point where I tracked down the offending commit: 70a3f89733a (git-merge documentation: describe how conflict is presented).

I don't have time to dig much deeper into this until later today, but it seems to be that the conflict markers are interpreted to indicate a section heading, that is then not correctly formated. The error i get is listed below. Feel free to try to beat me to finding a nice solution. :)

I am using xmlto 0.0.21 and Asciidoc 8.2.7.

/Gustaf

xmlto -m callouts.xsl man git-merge.xml
xmlto: input does not validate (status 1)
/scratch/src/git/git/Documentation/git-merge.xml:551: parser error :
attributes construct error
"&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&gt;&gt;&gt;&gt;&gt;".  The p
                                 ^
/scratch/src/git/git/Documentation/git-merge.xml:551: parser error :
Couldn't find end of Start Tag link line 551
"&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&gt;&gt;&gt;&gt;&gt;".  The p
                                 ^
/scratch/src/git/git/Documentation/git-merge.xml:551: parser error :
Opening and ending tag mismatch: simpara line 550 and link
"&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&gt;&gt;&gt;&gt;&gt;".  The p
                                                   ^
/scratch/src/git/git/Documentation/git-merge.xml:552: parser error :
Opening and ending tag mismatch: refsect1 line 526 and simpara
typically your side, and the part after it is typically their
side.</simpara>

     ^
/scratch/src/git/git/Documentation/git-merge.xml:577: parser error :
attributes construct error
<simpara>In addition to the "&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&
                                                             ^
/scratch/src/git/git/Documentation/git-merge.xml:577: parser error :
Couldn't find end of Start Tag link line 577
<simpara>In addition to the "&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&
                                                             ^
/scratch/src/git/git/Documentation/git-merge.xml:577: parser error :
Opening and ending tag mismatch: simpara line 577 and link
<simpara>In addition to the "&lt;&lt;&lt;&lt;<link
linkend=""">"======="</link>&

       ^
/scratch/src/git/git/Documentation/git-merge.xml:582: parser error :
Opening and ending tag mismatch: refentry line 3 and simpara
viewing the original.</simpara>
                               ^
/scratch/src/git/git/Documentation/git-merge.xml:584: parser error :
Extra content at the end of the document
</refsect1>
^