hgbook

view ja/examples/tour.merge.merge.out @ 966:39d37f84beaf

find changesets by author, revision, files, or words in the commit message
adding more new files - probably generated but still in versionning
author Romain PELISSE <belaran@gmail.com>
date Sun Aug 16 13:20:24 2009 +0200 (2009-08-16)
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)