hgbook

annotate en/examples/tour.merge.merge.out @ 348:0896fcbccdec

find changesets by author, revision, files, or words in the commit message
command to define how to enter translator's notes. Sorry about previous commit message
author jerojasro@localhost
date Sun Oct 19 22:51:00 2008 -0500 (2008-10-19)
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)