annotate en/examples/tour.merge.pull.out @ 254:7301e64c362e
Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Wed May 30 22:18:04 2007 -0700 (2007-05-30) |
| parents |
|
| children |
|
| rev |
line source |
|
bos@144
|
1 $ \textbf{hg pull ../my-hello}
|
|
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)
|
