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@xxxxxxxxxxx> --- On Thursday 04 September 2008, Gustaf Hendeby wrote: > 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). This fixes the problem for me. Have fun! :) ...Johan 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 69dd872..1f30830 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 -- 1.6.0.96.g2fad1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
