annotate en/examples/results/mq.dodiff.diff.out @ 593:8dfdbe1cf982
Update Apache2 configuration.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Thu Mar 26 22:00:32 2009 -0700 (2009-03-26) |
| parents |
44d1363234d2 |
| children |
4432ad34b8e5 |
| rev |
line source |
|
bos@564
|
1 <screen><prompt>$</prompt> <userinput>echo 'this is my original thought' > oldfile</userinput>
|
|
bos@564
|
2 <prompt>$</prompt> <userinput>echo 'i have changed my mind' > newfile</userinput>
|
|
bos@564
|
3 <prompt>$</prompt> <userinput>diff -u oldfile newfile > tiny.patch</userinput>
|
|
bos@564
|
4 <prompt>$</prompt> <userinput>cat tiny.patch</userinput>
|
|
bos@144
|
5
|
|
bos@144
|
6
|
|
bos@144
|
7 @@ -1 +1 @@
|
|
bos@289
|
8 -this is my original thought
|
|
bos@289
|
9 +i have changed my mind
|
|
bos@564
|
10 <prompt>$</prompt> <userinput>patch < tiny.patch</userinput>
|
|
bos@144
|
11 patching file oldfile
|
|
bos@564
|
12 <prompt>$</prompt> <userinput>cat oldfile</userinput>
|
|
bos@289
|
13 i have changed my mind
|
|
bos@564
|
14 </screen>
|
