hgbook

view ja/examples/tour.merge.merge.out @ 1005:0d743c1cf101

find changesets by author, revision, files, or words in the commit message
french : small corrections on ch02, place des <quote>
author William Dodé <wilk@flibuste.net>
date Tue Sep 15 12:42:52 2009 +0200 (2009-09-15)
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)