bos@611: <!-- BEGIN branching.merge -->
bos@564: <screen><prompt>$</prompt> <userinput>cd ../main</userinput>
bos@564: <prompt>$</prompt> <userinput>hg pull ../stable</userinput>
bos@179: pulling from ../stable
bos@179: searching for changes
bos@179: adding changesets
bos@179: adding manifests
bos@179: adding file changes
bos@179: added 1 changesets with 1 changes to 1 files (+1 heads)
bos@179: (run 'hg heads' to see heads, 'hg merge' to merge)
bos@564: <prompt>$</prompt> <userinput>hg merge</userinput>
bos@179: merging myfile
bos@179: 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
bos@179: (branch merge, don't forget to commit)
bos@564: <prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>
bos@564: <prompt>$</prompt> <userinput>cat myfile</userinput>
bos@179: This is a fix to a boring feature.
bos@179: This is exciting and new!
bos@564: </screen>
bos@611: <!-- END branching.merge -->