annotate en/examples/results/tour-merge-conflict.pull.out @ 609:c44d5854620b
Fix up chapter 1.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Mar 31 22:38:30 2009 -0700 (2009-03-31) |
| parents |
44d1363234d2 |
| children |
4432ad34b8e5 |
| rev |
line source |
|
bos@564
|
1 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
|
|
bos@564
|
2 <prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput>
|
|
hg@302
|
3 updating working directory
|
|
bos@144
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@564
|
5 <prompt>$</prompt> <userinput>cd scam-merge</userinput>
|
|
bos@564
|
6 <prompt>$</prompt> <userinput>hg pull -u ../scam-son</userinput>
|
|
bos@144
|
7 pulling from ../scam-son
|
|
bos@144
|
8 searching for changes
|
|
bos@144
|
9 adding changesets
|
|
bos@144
|
10 adding manifests
|
|
bos@144
|
11 adding file changes
|
|
bos@144
|
12 added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
bos@144
|
13 not updating, since new heads added
|
|
bos@144
|
14 (run 'hg heads' to see heads, 'hg merge' to merge)
|
|
bos@564
|
15 </screen>
|
