annotate en/examples/tour-merge-conflict.pull.out @ 253:bdd271cf1ae1
Update expected output.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Wed May 30 22:05:35 2007 -0700 (2007-05-30) |
| parents |
|
| children |
e281bd9a8e47 |
| rev |
line source |
|
bos@144
|
1 $ \textbf{cd ..}
|
|
bos@144
|
2 $ \textbf{hg clone scam-cousin scam-merge}
|
|
bos@144
|
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
4 $ \textbf{cd scam-merge}
|
|
bos@144
|
5 $ \textbf{hg pull -u ../scam-son}
|
|
bos@144
|
6 pulling from ../scam-son
|
|
bos@144
|
7 searching for changes
|
|
bos@144
|
8 adding changesets
|
|
bos@144
|
9 adding manifests
|
|
bos@144
|
10 adding file changes
|
|
bos@144
|
11 added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
bos@144
|
12 not updating, since new heads added
|
|
bos@144
|
13 (run 'hg heads' to see heads, 'hg merge' to merge)
|
