Mercurial > hgbook
view ja/examples/branch-named.merge.out @ 786:11bc9d788428
finished tour-basic.tex
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sun, 07 Jun 2009 20:25:51 +0900 |
parents | b0db5adf11c1 |
children |
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