Mercurial > hgbook
view en/examples/branch-named.merge.out @ 325:a8269a1b9164
more mq.tex
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Fri, 28 Mar 2008 02:11:02 +0900 |
parents | 6519f3b983b4 |
children | 2936cb7eae7a |
line wrap: on
line source
$ \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 <bos@serpentine.com> summary: Merge