Mercurial > hgbook

view en/examples/tour.merge.merge.out @ 492:2c2c86824c61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
began translation of the "behind the scenes" chapter
author Javier Rojas <jerojasro@devnull.li>
date Mon, 03 Nov 2008 21:00:32 -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)