Mercurial > hgbook
changeset 289:7be02466421b
Oops, forgot to update the output
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 18 Jan 2008 12:05:01 -0800 |
parents | cac3ac4536e5 |
children | b0db5adf11c1 e45d3f0d8da6 |
files | en/examples/mq.dodiff.diff.out |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/en/examples/mq.dodiff.diff.out Fri Jan 18 12:01:46 2008 -0800 +++ b/en/examples/mq.dodiff.diff.out Fri Jan 18 12:05:01 2008 -0800 @@ -1,13 +1,13 @@ -$ \textbf{echo 'this is my first line' > oldfile} -$ \textbf{echo 'my first line is here' > newfile} +$ \textbf{echo 'this is my original thought' > oldfile} +$ \textbf{echo 'i have changed my mind' > newfile} $ \textbf{diff -u oldfile newfile > tiny.patch} $ \textbf{cat tiny.patch} @@ -1 +1 @@ --this is my first line -+my first line is here +-this is my original thought ++i have changed my mind $ \textbf{patch < tiny.patch} patching file oldfile $ \textbf{cat oldfile} -my first line is here +i have changed my mind