1.1 --- a/en/examples/results/tour-merge-conflict.commit.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/tour-merge-conflict.commit.out	Tue Mar 31 22:38:30 2009 -0700
     1.3 @@ -1,16 +1,17 @@
     1.4 -$ \textbf{cat > letter.txt <<EOF}
     1.5 -> \textbf{Greetings!}
     1.6 -> \textbf{I am Bryan O'Sullivan, no relation of the former}
     1.7 -> \textbf{Nigerian dictator Sani Abacha.}
     1.8 -> \textbf{EOF}
     1.9 -$ \textbf{hg resolve -m letter.txt}
    1.10 -$ \textbf{hg commit -m 'Send me your money'}
    1.11 -$ \textbf{hg tip}
    1.12 +<screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
    1.13 +<prompt>></prompt> <userinput>Greetings!</userinput>
    1.14 +<prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
    1.15 +<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
    1.16 +<prompt>></prompt> <userinput>EOF</userinput>
    1.17 +<prompt>$</prompt> <userinput>hg resolve -m letter.txt</userinput>
    1.18 +<prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
    1.19 +<prompt>$</prompt> <userinput>hg tip</userinput>
    1.20  changeset:   
    1.21  tag:         tip
    1.22  parent:      
    1.23  parent:      
    1.24 -user:        Bryan O'Sullivan <bos@serpentine.com>
    1.25 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.26  
    1.27  summary:     Send me your money
    1.28  
    1.29 +</screen>