hgbook

diff en/examples/daily.revert.modify.out @ 492:b7b6a085056e

merged ikks' changes
author Javier Rojas <jerojasro@devnull.li>
date Wed Jan 07 22:27:30 2009 -0500 (2009-01-07)
parents 006bbad1f190
children
line diff
     1.1 --- a/en/examples/daily.revert.modify.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/daily.revert.modify.out	Wed Jan 07 22:27:30 2009 -0500
     1.3 @@ -5,6 +5,6 @@
     1.4  diff -r  file
     1.5  
     1.6  
     1.7 -@@ -1,1 +1,2 @@ original content
     1.8 +@@ -1,1 +1,2 @@
     1.9   original content
    1.10  +unwanted change