hgbook

diff en/examples/backout.non-tip.backout.out @ 356:0db175abfaf3

some friggin' merge or something like that.
author jerojasro@localhost
date Tue Oct 21 22:41:51 2008 -0500 (2008-10-21)
parents 006bbad1f190
children
line diff
     1.1 --- a/en/examples/backout.non-tip.backout.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/backout.non-tip.backout.out	Tue Oct 21 22:41:51 2008 -0500
     1.3 @@ -2,6 +2,7 @@
     1.4  $ \textbf{hg commit -m 'third change'}
     1.5  $ \textbf{hg backout --merge -m 'back out second change' 1}
     1.6  reverting myfile
     1.7 +created new head
     1.8  changeset  backs out changeset 
     1.9  merging with changeset 
    1.10  merging myfile