1.1 --- a/en/examples/results/tour-merge-conflict.pull.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/tour-merge-conflict.pull.out	Wed Mar 18 21:50:57 2009 +0800
     1.3 @@ -1,9 +1,9 @@
     1.4 -$ \textbf{cd ..}
     1.5 -$ \textbf{hg clone scam-cousin scam-merge}
     1.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
     1.7 +<prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput>
     1.8  updating working directory
     1.9  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    1.10 -$ \textbf{cd scam-merge}
    1.11 -$ \textbf{hg pull -u ../scam-son}
    1.12 +<prompt>$</prompt> <userinput>cd scam-merge</userinput>
    1.13 +<prompt>$</prompt> <userinput>hg pull -u ../scam-son</userinput>
    1.14  pulling from ../scam-son
    1.15  searching for changes
    1.16  adding changesets
    1.17 @@ -12,3 +12,4 @@
    1.18  added 1 changesets with 1 changes to 1 files (+1 heads)
    1.19  not updating, since new heads added
    1.20  (run 'hg heads' to see heads, 'hg merge' to merge)
    1.21 +</screen>