view en/examples/backout.non-tip.backout.out @ 591:b7b6a085056e

merged ikks' changes
author Javier Rojas <jerojasro@devnull.li>
date Wed, 07 Jan 2009 22:27:30 -0500
parents e0b56f008b09
children
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
created new head
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)