hgbook
annotate en/examples/mq.diff @ 19:187702df428b
Piles of new content for MQ chapter - cookbook stuff.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri Jul 07 19:56:53 2006 -0700 (2006-07-07) |
parents | |
children | 5cee64874312 |
rev | line source |
---|---|
bos@19 | 1 #$ name: diff |
bos@19 | 2 |
bos@19 | 3 echo 'this is my first line' > oldfile |
bos@19 | 4 echo 'my first line is here' > newfile |
bos@19 | 5 |
bos@19 | 6 diff -u oldfile newfile > tiny.patch |
bos@19 | 7 |
bos@19 | 8 cat tiny.patch |
bos@19 | 9 |
bos@19 | 10 patch < tiny.patch |
bos@19 | 11 |
bos@19 | 12 cat newfile |