annotate en/examples/results/daily.copy.merge.out @ 611:4432ad34b8e5
Check in example outputs with begin/end markers.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Mar 31 12:19:01 2009 -0700 (2009-03-31) |
| parents |
0d5935744f87 |
| children |
|
| rev |
line source |
|
bos@611
|
1 <!-- BEGIN daily.copy.merge -->
|
|
bos@564
|
2 <screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput>
|
|
bos@144
|
3 pulling from ../my-copy
|
|
bos@144
|
4 searching for changes
|
|
bos@144
|
5 adding changesets
|
|
bos@144
|
6 adding manifests
|
|
bos@144
|
7 adding file changes
|
|
bos@144
|
8 added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
bos@144
|
9 (run 'hg heads' to see heads, 'hg merge' to merge)
|
|
bos@564
|
10 <prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@548
|
11 merging file and new-file to new-file
|
|
bos@144
|
12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
13 (branch merge, don't forget to commit)
|
|
bos@564
|
14 <prompt>$</prompt> <userinput>cat new-file</userinput>
|
|
bos@144
|
15 line
|
|
bos@144
|
16 new contents
|
|
bos@564
|
17 </screen>
|
|
bos@611
|
18 <!-- END daily.copy.merge -->
|
