hgbook

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

find changesets by author, revision, files, or words in the commit message
Check in example outputs with begin/end markers.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 31 12:19:01 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 -->