hgbook
annotate ja/examples/mq.dodiff @ 996:6f8c48362758
merge with trunk
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Sat Sep 12 17:58:56 2009 +0200 (2009-09-12) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 #!/bin/bash |
| foozy@708 | 2 |
| foozy@708 | 3 #$ name: diff |
| foozy@708 | 4 |
| foozy@708 | 5 echo 'this is my first line' > oldfile |
| foozy@708 | 6 echo 'my first line is here' > newfile |
| foozy@708 | 7 |
| foozy@708 | 8 diff -u oldfile newfile > tiny.patch |
| foozy@708 | 9 |
| foozy@708 | 10 cat tiny.patch |
| foozy@708 | 11 |
| foozy@708 | 12 patch < tiny.patch |
| foozy@708 | 13 |
| foozy@708 | 14 cat oldfile |