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