hgbook

view ja/examples/tour.merge.merge.out @ 1008:df8efd83cfc9

find changesets by author, revision, files, or words in the commit message
french : corrections on ch04, <quote>...
author William Dodé <wilk@flibuste.net>
date Thu Sep 17 10:30:33 2009 +0200 (2009-09-17)
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)