hgbook
annotate ja/examples/mq.dodiff.diff.out @ 963:1dd00abb3fa9
merge with bryan - it's been a while but everything seems ok
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Sun Aug 16 03:41:39 2009 +0200 (2009-08-16) |
| 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 |