Mercurial > hgbook

view ja/examples/branch-named.merge.out @ 314:aa132d5e2b32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
completed draft translation for undo.tex.
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Mon, 18 Feb 2008 03:53:20 +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