hgbook

annotate 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
rev   line source
bos@564 1 <screen><prompt>$</prompt> <userinput>hg pull ../my-hello</userinput>
bos@144 2 pulling from ../my-hello
bos@144 3 searching for changes
bos@144 4 adding changesets
bos@144 5 adding manifests
bos@144 6 adding file changes
bos@144 7 added 1 changesets with 1 changes to 1 files (+1 heads)
bos@144 8 (run 'hg heads' to see heads, 'hg merge' to merge)
bos@564 9 </screen>