hgbook

view ja/examples/tour.merge.merge.out @ 1000:0fba9db5e75c

find changesets by author, revision, files, or words in the commit message
Added tag french-xdoc-build-fixed for changeset a6b81cd31cfd
author Romain PELISSE <belaran@gmail.com>
date Sat Sep 12 20:53:56 2009 +0200 (2009-09-12)
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)