hgbook
annotate en/examples/mq.dodiff @ 305:ef34f7bec749
Fix sample output for 'extdiff' test.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed Aug 20 22:04:41 2008 +0200 (2008-08-20) |
| parents | f2061ece8ed9 |
| children |
| rev | line source |
|---|---|
| bos@46 | 1 #!/bin/bash |
| bos@46 | 2 |
| bos@19 | 3 #$ name: diff |
| bos@19 | 4 |
| bos@288 | 5 echo 'this is my original thought' > oldfile |
| bos@288 | 6 echo 'i have changed my mind' > newfile |
| bos@19 | 7 |
| bos@19 | 8 diff -u oldfile newfile > tiny.patch |
| bos@19 | 9 |
| bos@19 | 10 cat tiny.patch |
| bos@19 | 11 |
| bos@19 | 12 patch < tiny.patch |
| bos@19 | 13 |
| makoto@252 | 14 cat oldfile |