view en/examples/daily.revert.modify.out @ 199:58e3a6c76725

More branch/merge stuff.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Apr 2007 17:37:27 -0700
parents 006bbad1f190
children 1ea91eb01030
line wrap: on
line source

$ \textbf{cat file}
original content
$ \textbf{echo unwanted change >> file}
$ \textbf{hg diff file}
diff -r  file


@@ -1,1 +1,2 @@ original content
 original content
+unwanted change