hgbook

diff en/examples/backout.non-tip.cat.out @ 948:afdc168fa06c

Merge from Hugues and my work
author Romain PELISSE <belaran@gmail.com>
date Mon Feb 16 23:31:14 2009 +0100 (2009-02-16)
parents 006bbad1f190
children
line diff
     1.1 --- a/en/examples/backout.non-tip.cat.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/backout.non-tip.cat.out	Mon Feb 16 23:31:14 2009 +0100
     1.3 @@ -1,2 +1,3 @@
     1.4  $ \textbf{cat myfile}
     1.5 +first change
     1.6  third change