Mercurial > hgbook

view en/examples/tour.merge.merge.out @ 395:e0b56f008b09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sample output for 'backout' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 21:51:54 +0200
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)