Mercurial > hgbook
diff en/examples/extdiff.extdiff-ctx.out @ 273:00f69e8825c5
Bring book up to date with recent changes.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon, 26 Nov 2007 12:24:53 -0800 |
| parents | eef2171243e8 |
| children |
line wrap: on
line diff
--- a/en/examples/extdiff.extdiff-ctx.out Mon Nov 26 11:18:46 2007 -0800 +++ b/en/examples/extdiff.extdiff-ctx.out Mon Nov 26 12:24:53 2007 -0800 @@ -1,8 +1,5 @@ $ \textbf{hg extdiff -o -NprcC5} -making snapshot of 1 files from rev -making snapshot of 1 files from working dir -diff -NprcC5 a./myfile a/myfile -*** a./myfile Sat May 26 18:14:31 2007 + *************** *** 1 ****
