hgbook

view en/examples/results/tour.merge.merge.out @ 564:0d5935744f87

find changesets by author, revision, files, or words in the commit message
Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 09 21:39:23 2009 -0700 (2009-03-09)
parents 44d1363234d2
children 4432ad34b8e5
line source
1 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
2 merging hello.c
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit)
5 </screen>