1.1 --- a/en/examples/results/branch-named.merge.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/branch-named.merge.out	Mon Mar 09 21:39:23 2009 -0700
     1.3 @@ -1,16 +1,17 @@
     1.4 -$ \textbf{hg branch}
     1.5 +<screen><prompt>$</prompt> <userinput>hg branch</userinput>
     1.6  bar
     1.7 -$ \textbf{hg merge foo}
     1.8 +<prompt>$</prompt> <userinput>hg merge foo</userinput>
     1.9  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    1.10  (branch merge, don't forget to commit)
    1.11 -$ \textbf{hg commit -m 'Merge'}
    1.12 -$ \textbf{hg tip}
    1.13 +<prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput>
    1.14 +<prompt>$</prompt> <userinput>hg tip</userinput>
    1.15  changeset:   
    1.16  branch:      bar
    1.17  tag:         tip
    1.18  parent:      
    1.19  parent:      
    1.20 -user:        Bryan O'Sullivan <bos@serpentine.com>
    1.21 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.22  
    1.23  summary:     Merge
    1.24  
    1.25 +</screen>