Mercurial > hgbook

view en/examples/tour.merge.merge.out @ 530:f809de31887a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more translation :D added a term to the glossary
author jerojasro@localhost
date Sun, 30 Nov 2008 18:41:51 -0500
parents 006bbad1f190
children
line wrap: on
line source

$ \textbf{hg merge}
merging hello.c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)