bos@179: $ \textbf{cd ../main}
bos@179: $ \textbf{hg pull ../stable}
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@179: $ \textbf{hg merge}
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@179: $ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
bos@179: $ \textbf{cat myfile}
bos@179: This is a fix to a boring feature.
bos@179: This is exciting and new!