Mercurial > hgbook

view en/examples/tour.merge.merge.out @ 180:6413f88338df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Point to chapter on undoing mistakes.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 30 Mar 2007 23:20:27 -0700
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)