hgbook

diff ja/examples/backout.non-tip.backout.out @ 993:71dbda516572

French translation : merge with Jean Marie Clement's work on ch04-concepts
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Fri Sep 11 14:35:36 2009 +0200 (2009-09-11)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/backout.non-tip.backout.out	Fri Sep 11 14:35:36 2009 +0200
     1.3 @@ -0,0 +1,9 @@
     1.4 +$ \textbf{echo third change >> myfile}
     1.5 +$ \textbf{hg commit -m 'third change'}
     1.6 +$ \textbf{hg backout --merge -m 'back out second change' 1}
     1.7 +reverting myfile
     1.8 +changeset  backs out changeset 
     1.9 +merging with changeset 
    1.10 +merging myfile
    1.11 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    1.12 +(branch merge, don't forget to commit)