hgbook
diff en/examples/mq.dodiff @ 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 | 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 Tue Oct 21 22:41:51 2008 -0500 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