1 <screen><prompt>$</prompt> <userinput>cd ../main</userinput>

2 <prompt>$</prompt> <userinput>hg pull ../stable</userinput>

3 pulling from ../stable

4 searching for changes

5 adding changesets

6 adding manifests

7 adding file changes

8 added 1 changesets with 1 changes to 1 files (+1 heads)

9 (run 'hg heads' to see heads, 'hg merge' to merge)

10 <prompt>$</prompt> <userinput>hg merge</userinput>

11 merging myfile

12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved

13 (branch merge, don't forget to commit)

14 <prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>

15 <prompt>$</prompt> <userinput>cat myfile</userinput>

16 This is a fix to a boring feature.

17 This is exciting and new!

18 </screen>