1.1 --- a/en/examples/results/tour-merge-conflict.wife.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/tour-merge-conflict.wife.out	Fri Mar 27 10:08:39 2009 -0700
     1.3 @@ -1,7 +1,8 @@
     1.4 -$ \textbf{cat > letter.txt <<EOF}
     1.5 -> \textbf{Greetings!}
     1.6 -> \textbf{I am Mariam Abacha, the wife of former}
     1.7 -> \textbf{Nigerian dictator Sani Abacha.}
     1.8 -> \textbf{EOF}
     1.9 -$ \textbf{hg add letter.txt}
    1.10 -$ \textbf{hg commit -m '419 scam, first draft'}
    1.11 +<screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
    1.12 +<prompt>></prompt> <userinput>Greetings!</userinput>
    1.13 +<prompt>></prompt> <userinput>I am Mariam Abacha, the wife of former</userinput>
    1.14 +<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
    1.15 +<prompt>></prompt> <userinput>EOF</userinput>
    1.16 +<prompt>$</prompt> <userinput>hg add letter.txt</userinput>
    1.17 +<prompt>$</prompt> <userinput>hg commit -m '419 scam, first draft'</userinput>
    1.18 +</screen>