hgbook
diff en/examples/extdiff.extdiff-ctx.out @ 495:dfa2890d9b30
translated most of section 13.8
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Wed Jan 07 23:38:40 2009 -0500 (2009-01-07) |
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 Jan 07 23:38:40 2009 -0500 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 ****