Mercurial > hgbook

view en/examples/results/branch-named.merge.out @ 744:1114da00d30e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix '<programlisting>' in ch02-tour-basic.xml
author Dongsheng Song <dongsheng.song@gmail.com>
date Wed, 18 Mar 2009 19:43:46 +0800
parents 0d5935744f87
children 4432ad34b8e5
line wrap: on
line source

<screen><prompt>$</prompt> <userinput>hg branch</userinput>
bar
<prompt>$</prompt> <userinput>hg merge foo</userinput>
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
<prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput>
<prompt>$</prompt> <userinput>hg tip</userinput>
changeset:   
branch:      bar
tag:         tip
parent:      
parent:      
user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;

summary:     Merge

</screen>