hgbook
view 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 |
line source
1 $ \textbf{echo 'this is my first line' > oldfile}
2 $ \textbf{echo 'my first line is here' > newfile}
3 $ \textbf{diff -u oldfile newfile > tiny.patch}
4 $ \textbf{cat tiny.patch}
7 @@ -1 +1 @@
8 -this is my first line
9 +my first line is here
10 $ \textbf{patch < tiny.patch}
11 patching file oldfile
12 $ \textbf{cat oldfile}
13 my first line is here