1.1 --- a/en/examples/results/branch-repo.merge.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/branch-repo.merge.out	Thu Mar 26 23:05:28 2009 -0700
     1.3 @@ -1,11 +1,12 @@
     1.4 -$ \textbf{hg merge}
     1.5 +<screen><prompt>$</prompt> <userinput>hg merge</userinput>
     1.6  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1.7  (branch merge, don't forget to commit)
     1.8 -$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
     1.9 -$ \textbf{hg push}
    1.10 +<prompt>$</prompt> <userinput>hg commit -m 'Merge bugfix from 1.0.1 branch'</userinput>
    1.11 +<prompt>$</prompt> <userinput>hg push</userinput>
    1.12  pushing to 
    1.13  searching for changes
    1.14  adding changesets
    1.15  adding manifests
    1.16  adding file changes
    1.17  added 2 changesets with 1 changes to 1 files
    1.18 +</screen>