hgbook

view ja/examples/tour.merge.merge.out @ 991:e6894aa7baf2

find changesets by author, revision, files, or words in the commit message
French translation; ch04-concepts.xml; 10percent
author Jean-Marie Clément <JeanMarieClement@web.de>
date Mon Sep 07 23:16:08 2009 +0200 (2009-09-07)
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)