hgbook

view ja/examples/tour.merge.merge.out @ 1015:ef0132c0a014

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 15:52:19 2009 +0100 (2009-11-24)
parents
children
line source
1 $ \textbf{hg merge}
2 merging hello.c
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit)