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