$ hg branch
bar
$ hg merge foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -m 'Merge'
$ hg tip
changeset:
branch: bar
tag: tip
parent:
parent:
user: Bryan O'Sullivan <bos@serpentine.com>
summary: Merge