hgbook

annotate en/examples/tour.merge.merge.out @ 264:f8a2fe77908d

find changesets by author, revision, files, or words in the commit message
3 small typos
author arne@fluss.krababnet
date Fri Aug 31 11:15:18 2007 +0200 (2007-08-31)
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)