1.1 --- a/en/examples/results/branching.merge.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/branching.merge.out	Thu Mar 26 20:24:44 2009 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4 -$ \textbf{cd ../main}
     1.5 -$ \textbf{hg pull ../stable}
     1.6 +<screen><prompt>$</prompt> <userinput>cd ../main</userinput>
     1.7 +<prompt>$</prompt> <userinput>hg pull ../stable</userinput>
     1.8  pulling from ../stable
     1.9  searching for changes
    1.10  adding changesets
    1.11 @@ -7,11 +7,12 @@
    1.12  adding file changes
    1.13  added 1 changesets with 1 changes to 1 files (+1 heads)
    1.14  (run 'hg heads' to see heads, 'hg merge' to merge)
    1.15 -$ \textbf{hg merge}
    1.16 +<prompt>$</prompt> <userinput>hg merge</userinput>
    1.17  merging myfile
    1.18  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    1.19  (branch merge, don't forget to commit)
    1.20 -$ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
    1.21 -$ \textbf{cat myfile}
    1.22 +<prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>
    1.23 +<prompt>$</prompt> <userinput>cat myfile</userinput>
    1.24  This is a fix to a boring feature.
    1.25  This is exciting and new!
    1.26 +</screen>