Mercurial > hgbook

view en/examples/branch-named.merge.out @ 427:b7d284121f21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from somewhere else
author jerojasro@localhost
date Thu, 16 Oct 2008 23:25:41 -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