hgbook
diff it/examples/extdiff.extdiff.it @ 1052:c8b5a06543c0
cvs section translated
author | zhaopingsun |
---|---|
date | Tue Nov 10 16:25:43 2009 -0500 (2009-11-10) |
parents | 16c50eea5366 |
children | 719b03ea27c8 |
line diff
1.1 --- a/it/examples/extdiff.extdiff.it Sat Aug 15 03:01:38 2009 +0200 1.2 +++ b/it/examples/extdiff.extdiff.it Tue Nov 10 16:25:43 2009 -0500 1.3 @@ -1,7 +1,7 @@ 1.4 <!-- BEGIN extdiff.extdiff --> 1.5 <screen><prompt>$</prompt> <userinput>hg extdiff</userinput> 1.6 --- a.dc7b09ad1097/miofile 2009-06-05 15:50:17.000000000 +0000 1.7 -+++ /temp/a/miofile 2009-06-05 15:50:16.000000000 +0000 1.8 ++++ /tmp/a/miofile 2009-06-05 15:50:16.000000000 +0000 1.9 @@ -1 +1,2 @@ 1.10 La prima riga. 1.11 +La seconda riga.