hgbook

annotate en/examples/tour.merge.merge.out @ 263:9dbed77d3ba6

find changesets by author, revision, files, or words in the commit message
Fix typo
author Tong-Kiat Tan <tktan@jokey.org>
date Fri Jul 27 15:07:51 2007 -0700 (2007-07-27)
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)