hgbook
view en/examples/results/mq.dodiff.diff.out @ 609:c44d5854620b
Fix up chapter 1.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Mar 31 22:38:30 2009 -0700 (2009-03-31) |
| parents | 44d1363234d2 |
| children | 4432ad34b8e5 |
line source
1 <screen><prompt>$</prompt> <userinput>echo 'this is my original thought' > oldfile</userinput>
2 <prompt>$</prompt> <userinput>echo 'i have changed my mind' > newfile</userinput>
3 <prompt>$</prompt> <userinput>diff -u oldfile newfile > tiny.patch</userinput>
4 <prompt>$</prompt> <userinput>cat tiny.patch</userinput>
7 @@ -1 +1 @@
8 -this is my original thought
9 +i have changed my mind
10 <prompt>$</prompt> <userinput>patch < tiny.patch</userinput>
11 patching file oldfile
12 <prompt>$</prompt> <userinput>cat oldfile</userinput>
13 i have changed my mind
14 </screen>