hgbook

annotate en/examples/tour.merge.merge.out @ 183:fe74ace5fe1c

find changesets by author, revision, files, or words in the commit message
Fix simple copy example.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Mar 30 23:28:34 2007 -0700 (2007-03-30)
parents
children
rev   line source
bos@144 1 $ \textbf{hg merge}
bos@144 2 merging hello.c
bos@144 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
bos@144 4 (branch merge, don't forget to commit)