view ja/examples/backout.non-tip.backout.out @ 799:7107b79427a3

Propagate 4e23c220d1b0 Update chapter 2
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 18 Jun 2009 19:11:36 +0900
parents b0db5adf11c1
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
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)