1.1 --- a/en/examples/results/backout.manual.merge.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/backout.manual.merge.out	Mon Mar 09 21:39:23 2009 -0700
     1.3 @@ -1,8 +1,9 @@
     1.4 -$ \textbf{hg merge}
     1.5 +<screen><prompt>$</prompt> <userinput>hg merge</userinput>
     1.6  merging myfile
     1.7  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
     1.8  (branch merge, don't forget to commit)
     1.9 -$ \textbf{hg commit -m 'merged backout with previous tip'}
    1.10 -$ \textbf{cat myfile}
    1.11 +<prompt>$</prompt> <userinput>hg commit -m 'merged backout with previous tip'</userinput>
    1.12 +<prompt>$</prompt> <userinput>cat myfile</userinput>
    1.13  first change
    1.14  third change
    1.15 +</screen>