hgbook

changeset 289:7be02466421b

Oops, forgot to update the output
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Jan 18 12:05:01 2008 -0800 (2008-01-18)
parents cac3ac4536e5
children e45d3f0d8da6
files en/examples/mq.dodiff.diff.out
line diff
     1.1 --- a/en/examples/mq.dodiff.diff.out	Fri Jan 18 12:01:46 2008 -0800
     1.2 +++ b/en/examples/mq.dodiff.diff.out	Fri Jan 18 12:05:01 2008 -0800
     1.3 @@ -1,13 +1,13 @@
     1.4 -$ \textbf{echo 'this is my first line' > oldfile}
     1.5 -$ \textbf{echo 'my first line is here' > newfile}
     1.6 +$ \textbf{echo 'this is my original thought' > oldfile}
     1.7 +$ \textbf{echo 'i have changed my mind' > newfile}
     1.8  $ \textbf{diff -u oldfile newfile > tiny.patch}
     1.9  $ \textbf{cat tiny.patch}
    1.10  
    1.11  
    1.12  @@ -1 +1 @@
    1.13 --this is my first line
    1.14 -+my first line is here
    1.15 +-this is my original thought
    1.16 ++i have changed my mind
    1.17  $ \textbf{patch < tiny.patch}
    1.18  patching file oldfile
    1.19  $ \textbf{cat oldfile}
    1.20 -my first line is here
    1.21 +i have changed my mind