Mercurial > hgbook
view en/examples/branch-named.merge.out @ 398:2936cb7eae7a
Fix sample output for test 'branch-named'.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed, 20 Aug 2008 21:55:35 +0200 |
parents | 6519f3b983b4 |
children |
line wrap: on
line source
$ \textbf{hg branch} bar $ \textbf{hg merge foo} 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 <bos@serpentine.com> summary: Merge