hgbook

view en/examples/results/tour.merge.merge.out @ 614:c8680784cdbb

find changesets by author, revision, files, or words in the commit message
Make builds more reliable.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 31 15:35:44 2009 -0700 (2009-03-31)
parents 0d5935744f87
children
line source
1 <!-- BEGIN tour.merge.merge -->
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
3 merging hello.c
4 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
5 (branch merge, don't forget to commit)
6 </screen>
7 <!-- END tour.merge.merge -->