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