1.1 --- a/en/examples/results/daily.copy.merge.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/daily.copy.merge.out	Mon Mar 09 21:39:23 2009 -0700
     1.3 @@ -1,4 +1,4 @@
     1.4 -$ \textbf{hg pull ../my-copy}
     1.5 +<screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput>
     1.6  pulling from ../my-copy
     1.7  searching for changes
     1.8  adding changesets
     1.9 @@ -6,10 +6,11 @@
    1.10  adding file changes
    1.11  added 1 changesets with 1 changes to 1 files (+1 heads)
    1.12  (run 'hg heads' to see heads, 'hg merge' to merge)
    1.13 -$ \textbf{hg merge}
    1.14 +<prompt>$</prompt> <userinput>hg merge</userinput>
    1.15  merging file and new-file to new-file
    1.16  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    1.17  (branch merge, don't forget to commit)
    1.18 -$ \textbf{cat new-file}
    1.19 +<prompt>$</prompt> <userinput>cat new-file</userinput>
    1.20  line
    1.21  new contents
    1.22 +</screen>