hgbook
view en/examples/mq.dodiff.diff.out @ 275:96ea24a916f9
Merge with myself.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Nov 26 20:42:36 2007 -0800 (2007-11-26) |
| parents | 006bbad1f190 |
| children | 7be02466421b |
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