Mercurial > hgbook

view en/examples/backout.manual.merge.out @ 484:0abd3d78172e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
finished translation of a figure translated a few paragraphs of tour-merge
author Javier Rojas <jerojasro@devnull.li>
date Sun, 02 Nov 2008 13:54:42 -0500
parents 5fc4a45c069f
children
line wrap: on
line source

$ \textbf{hg merge}
merging myfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ \textbf{hg commit -m 'merged backout with previous tip'}
$ \textbf{cat myfile}
first change
third change