hgbook
annotate ja/examples/mq.dodiff.diff.out @ 1113:613690ad6a9c
Merge with dongsheng
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sat Jul 10 16:21:26 2010 +0100 (2010-07-10) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{echo 'this is my first line' > oldfile} |
| foozy@708 | 2 $ \textbf{echo 'my first line is here' > newfile} |
| foozy@708 | 3 $ \textbf{diff -u oldfile newfile > tiny.patch} |
| foozy@708 | 4 $ \textbf{cat tiny.patch} |
| foozy@708 | 5 |
| foozy@708 | 6 |
| foozy@708 | 7 @@ -1 +1 @@ |
| foozy@708 | 8 -this is my first line |
| foozy@708 | 9 +my first line is here |
| foozy@708 | 10 $ \textbf{patch < tiny.patch} |
| foozy@708 | 11 patching file oldfile |
| foozy@708 | 12 $ \textbf{cat oldfile} |
| foozy@708 | 13 my first line is here |