annotate en/examples/results/daily.copy.merge.out @ 580:8366882f67f2
Fix up more formatting goop
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Wed Mar 18 00:00:58 2009 -0700 (2009-03-18) |
| parents |
44d1363234d2 |
| children |
4432ad34b8e5 |
| rev |
line source |
|
bos@564
|
1 <screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput>
|
|
bos@144
|
2 pulling from ../my-copy
|
|
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 <prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@548
|
10 merging file and new-file to new-file
|
|
bos@144
|
11 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
12 (branch merge, don't forget to commit)
|
|
bos@564
|
13 <prompt>$</prompt> <userinput>cat new-file</userinput>
|
|
bos@144
|
14 line
|
|
bos@144
|
15 new contents
|
|
bos@564
|
16 </screen>
|
