hgbook

view ja/examples/tour.merge.merge.out @ 989:a3a9eabfe2a4

find changesets by author, revision, files, or words in the commit message
French translation : ch05-daily translated
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Thu Sep 10 13:06:34 2009 +0200 (2009-09-10)
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)