hgbook
view en/examples/mq.dodiff.diff.out @ 495:dfa2890d9b30
translated most of section 13.8
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Wed Jan 07 23:38:40 2009 -0500 (2009-01-07) |
| parents | bdd271cf1ae1 |
| children |
line source
1 $ \textbf{echo 'this is my original thought' > oldfile}
2 $ \textbf{echo 'i have changed my mind' > newfile}
3 $ \textbf{diff -u oldfile newfile > tiny.patch}
4 $ \textbf{cat tiny.patch}
7 @@ -1 +1 @@
8 -this is my original thought
9 +i have changed my mind
10 $ \textbf{patch < tiny.patch}
11 patching file oldfile
12 $ \textbf{cat oldfile}
13 i have changed my mind