hgbook
diff it/examples/extdiff.extdiff.it @ 976:713f0f69029a
merge with Italian, and very (few) work on ch03
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Fri Sep 04 16:33:35 2009 +0200 (2009-09-04) |
parents | |
children | 719b03ea27c8 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/it/examples/extdiff.extdiff.it Fri Sep 04 16:33:35 2009 +0200 1.3 @@ -0,0 +1,9 @@ 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 ++++ /tmp/a/miofile 2009-06-05 15:50:16.000000000 +0000 1.8 +@@ -1 +1,2 @@ 1.9 + La prima riga. 1.10 ++La seconda riga. 1.11 +</screen> 1.12 +<!-- END extdiff.extdiff -->