hgbook

diff en/examples/mq.dodiff.diff.out @ 362:90b67ac5862b

translated up to section 1.4.1
author Javier Rojas <jerojasro@devnull.li>
date Sat Oct 25 15:01:39 2008 -0500 (2008-10-25)
parents bdd271cf1ae1
children
line diff
     1.1 --- a/en/examples/mq.dodiff.diff.out	Wed May 30 22:05:35 2007 -0700
     1.2 +++ b/en/examples/mq.dodiff.diff.out	Sat Oct 25 15:01:39 2008 -0500
     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