Mercurial > hgbook

view en/examples/results/mq.dodiff.diff.out @ 663:0d5935744f87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:39:23 -0700
parents 44d1363234d2
children 4432ad34b8e5
line wrap: on
line source

<screen><prompt>$</prompt> <userinput>echo 'this is my original thought' &gt; oldfile</userinput>
<prompt>$</prompt> <userinput>echo 'i have changed my mind' &gt; newfile</userinput>
<prompt>$</prompt> <userinput>diff -u oldfile newfile &gt; tiny.patch</userinput>
<prompt>$</prompt> <userinput>cat tiny.patch</userinput>


@@ -1 +1 @@
-this is my original thought
+i have changed my mind
<prompt>$</prompt> <userinput>patch &lt; tiny.patch</userinput>
patching file oldfile
<prompt>$</prompt> <userinput>cat oldfile</userinput>
i have changed my mind
</screen>