hgbook

diff en/examples/results/tour.merge.pull.out @ 564:0d5935744f87

Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 09 21:39:23 2009 -0700 (2009-03-09)
parents 44d1363234d2
children 4432ad34b8e5
line diff
     1.1 --- a/en/examples/results/tour.merge.pull.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/tour.merge.pull.out	Mon Mar 09 21:39:23 2009 -0700
     1.3 @@ -1,4 +1,4 @@
     1.4 -$ \textbf{hg pull ../my-hello}
     1.5 +<screen><prompt>$</prompt> <userinput>hg pull ../my-hello</userinput>
     1.6  pulling from ../my-hello
     1.7  searching for changes
     1.8  adding changesets
     1.9 @@ -6,3 +6,4 @@
    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 +</screen>