hgbook

annotate ja/examples/tour.merge.merge.out @ 1014:4650cddc0c27

find changesets by author, revision, files, or words in the commit message
some typo and better french translation
author André Sintzoff <andre.sintzoff@gmail.com>
date Tue Nov 24 14:13:03 2009 +0100 (2009-11-24)
parents
children
rev   line source
foozy@708 1 $ \textbf{hg merge}
foozy@708 2 merging hello.c
foozy@708 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
foozy@708 4 (branch merge, don't forget to commit)