bos@199: $ \textbf{hg merge}
bos@199: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bos@199: (branch merge, don't forget to commit)
bos@199: $ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
bos@199: $ \textbf{hg push}
bos@199: pushing to 
bos@199: searching for changes
bos@199: adding changesets
bos@199: adding manifests
bos@199: adding file changes
bos@199: added 2 changesets with 1 changes to 1 files