bos@611: <!-- BEGIN tour-merge-conflict.pull -->
bos@564: <screen><prompt>$</prompt> <userinput>cd ..</userinput>
bos@564: <prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput>
hg@302: updating working directory
bos@144: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bos@564: <prompt>$</prompt> <userinput>cd scam-merge</userinput>
bos@564: <prompt>$</prompt> <userinput>hg pull -u ../scam-son</userinput>
bos@144: pulling from ../scam-son
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: not updating, since new heads added
bos@144: (run 'hg heads' to see heads, 'hg merge' to merge)
bos@564: </screen>
bos@611: <!-- END tour-merge-conflict.pull -->