$ \textbf{hg branch} bar $ \textbf{hg merge} 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ \textbf{hg commit -m 'Merge'} $ \textbf{hg tip} changeset: branch: bar tag: tip parent: parent: user: Bryan O'Sullivan summary: Merge