hgbook
view en/examples/results/daily.copy.merge.out @ 564:0d5935744f87
Switch from LaTeX to XML for examples.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Mar 09 21:39:23 2009 -0700 (2009-03-09) |
| parents | 44d1363234d2 |
| children | 4432ad34b8e5 |
line source
1 <screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput>
2 pulling from ../my-copy
3 searching for changes
4 adding changesets
5 adding manifests
6 adding file changes
7 added 1 changesets with 1 changes to 1 files (+1 heads)
8 (run 'hg heads' to see heads, 'hg merge' to merge)
9 <prompt>$</prompt> <userinput>hg merge</userinput>
10 merging file and new-file to new-file
11 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
12 (branch merge, don't forget to commit)
13 <prompt>$</prompt> <userinput>cat new-file</userinput>
14 line
15 new contents
16 </screen>