Mercurial > hgbook

view en/examples/backout.non-tip.backout.out @ 156:91a936be78b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Document merge behaviour with file names.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 12 Mar 2007 23:11:26 -0700
parents 006bbad1f190
children e0b56f008b09
line wrap: on
line source

$ \textbf{echo third change >> myfile}
$ \textbf{hg commit -m 'third change'}
$ \textbf{hg backout --merge -m 'back out second change' 1}
reverting myfile
changeset  backs out changeset 
merging with changeset 
merging myfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)