1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/backout.non-tip.backout.out	Sun Nov 08 17:25:59 2009 -0500
     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)