Mercurial > hgbook

view en/examples/tour.merge.merge.out @ 431:d13a05515acf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing problem on bisect that inhibits building with mercurial 1.0 or later
author Igor Támara <igor@tamarapatino.org>
date Sat, 18 Oct 2008 06:02:21 -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)