Mercurial > hgbook

view en/examples/results/tour.merge.merge.out @ 709:4432ad34b8e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check in example outputs with begin/end markers.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 31 Mar 2009 12:19:01 -0700
parents 0d5935744f87
children
line wrap: on
line source

<!-- BEGIN tour.merge.merge -->
<screen><prompt>$</prompt> <userinput>hg merge</userinput>
merging hello.c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
</screen>
<!-- END tour.merge.merge -->