hgbook

view en/examples/tour.merge.merge.out @ 165:06d18465df03

find changesets by author, revision, files, or words in the commit message
Make an example run more predictably.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 26 22:45:48 2007 -0700 (2007-03-26)
parents
children
line source
1 $ \textbf{hg merge}
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)