# HG changeset patch # User Bryan O'Sullivan # Date 1200686701 28800 # Node ID 7be02466421bcb6d96e6ea60ee4da2e9721b8aaf # Parent cac3ac4536e53a910b2795f5db24cb00c243eb2e Oops, forgot to update the output diff -r cac3ac4536e5 -r 7be02466421b en/examples/mq.dodiff.diff.out --- 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