Mercurial > hgbook

view en/examples/branch-named.merge.out @ 653:91adcea08b33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the bisect section, I hope (bisect is now part of Mercurial).
author Arne Babenhauserheide <bab@draketo.de>
date Wed, 21 Jan 2009 14:16:38 +0100
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