hgbook
annotate en/examples/mq.dodiff @ 980:c40dac4f63d8
merge with Jean Marie Clément
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Fri Sep 04 18:55:53 2009 +0200 (2009-09-04) |
| 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 |