hgbook
annotate en/examples/mq.dodiff.diff.out @ 360:d4a0d7488a08
Merged jerojasro changes
| author | Igor TAmara <igor@tamarapatino.org> |
|---|---|
| date | Sat Oct 25 17:29:33 2008 -0500 (2008-10-25) |
| parents | bdd271cf1ae1 |
| children |
| rev | line source |
|---|---|
| bos@289 | 1 $ \textbf{echo 'this is my original thought' > oldfile} |
| bos@289 | 2 $ \textbf{echo 'i have changed my mind' > newfile} |
| bos@144 | 3 $ \textbf{diff -u oldfile newfile > tiny.patch} |
| bos@144 | 4 $ \textbf{cat tiny.patch} |
| bos@144 | 5 |
| bos@144 | 6 |
| bos@144 | 7 @@ -1 +1 @@ |
| bos@289 | 8 -this is my original thought |
| bos@289 | 9 +i have changed my mind |
| bos@144 | 10 $ \textbf{patch < tiny.patch} |
| bos@144 | 11 patching file oldfile |
| bos@253 | 12 $ \textbf{cat oldfile} |
| bos@289 | 13 i have changed my mind |