hgbook
diff en/examples/mq.dodiff @ 712:e8763d4b37b1
Merge with http://hg.serpentine.com/mercurial/book
author | Dongsheng Song <dongsheng.song@gmail.com> |
---|---|
date | Thu May 21 14:16:17 2009 +0800 (2009-05-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 Thu May 21 14:16:17 2009 +0800 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