hgbook
diff en/examples/extdiff.extdiff-ctx.out @ 305:ef34f7bec749
Fix sample output for 'extdiff' test.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed Aug 20 22:04:41 2008 +0200 (2008-08-20) |
parents | eef2171243e8 |
children |
line diff
1.1 --- a/en/examples/extdiff.extdiff-ctx.out Sat May 26 11:52:18 2007 -0700 1.2 +++ b/en/examples/extdiff.extdiff-ctx.out Wed Aug 20 22:04:41 2008 +0200 1.3 @@ -1,8 +1,5 @@ 1.4 $ \textbf{hg extdiff -o -NprcC5} 1.5 -making snapshot of 1 files from rev 1.6 -making snapshot of 1 files from working dir 1.7 -diff -NprcC5 a./myfile a/myfile 1.8 -*** a./myfile Sat May 26 18:14:31 2007 1.9 + 1.10 1.11 *************** 1.12 *** 1 ****