Mercurial > hgbook

view en/examples/branch-named.merge.out @ 574:22184eb4c965

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
finished the translation of the section "information for writers of hooks" updated project status
author Javier Rojas <jerojasro@devnull.li>
date Wed, 31 Dec 2008 11:31:04 -0500
parents 2936cb7eae7a
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