hgbook
diff en/examples/mq.dodiff @ 980:c40dac4f63d8
merge with Jean Marie Clément
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Fri Sep 04 18:55:53 2009 +0200 (2009-09-04) |
parents | f2061ece8ed9 |
children |
line diff
1.1 --- a/en/examples/mq.dodiff Wed May 30 22:02:48 2007 -0700 1.2 +++ b/en/examples/mq.dodiff Fri Sep 04 18:55:53 2009 +0200 1.3 @@ -2,8 +2,8 @@ 1.4 1.5 #$ name: diff 1.6 1.7 -echo 'this is my first line' > oldfile 1.8 -echo 'my first line is here' > newfile 1.9 +echo 'this is my original thought' > oldfile 1.10 +echo 'i have changed my mind' > newfile 1.11 1.12 diff -u oldfile newfile > tiny.patch 1.13