hgbook
view 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 |
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