hgbook
annotate fr/examples/mq.dodiff @ 1012:7ec542fabc34
some typo and better french translation
author | André Sintzoff <andre.sintzoff@gmail.com> |
---|---|
date | Mon Nov 23 19:06:32 2009 +0100 (2009-11-23) |
parents | cac3ac4536e5 |
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 |