bos@564: <screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput>
bos@144: pulling from ../my-copy
bos@144: searching for changes
bos@144: adding changesets
bos@144: adding manifests
bos@144: adding file changes
bos@144: added 1 changesets with 1 changes to 1 files (+1 heads)
bos@144: (run 'hg heads' to see heads, 'hg merge' to merge)
bos@564: <prompt>$</prompt> <userinput>hg merge</userinput>
bos@548: merging file and new-file to new-file
bos@144: 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
bos@144: (branch merge, don't forget to commit)
bos@564: <prompt>$</prompt> <userinput>cat new-file</userinput>
bos@144: line
bos@144: new contents
bos@564: </screen>