hgbook
view it/examples/extdiff.extdiff.it @ 1011:a05a5ae66c38
merge
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Mon Nov 23 10:51:14 2009 +0100 (2009-11-23) |
parents | 713f0f69029a c35067358254 |
children |
line source
1 <!-- BEGIN extdiff.extdiff -->
2 <screen><prompt>$</prompt> <userinput>hg extdiff</userinput>
3 --- a.dc7b09ad1097/miofile 2009-06-05 15:50:17.000000000 +0000
4 +++ /tmp/a/miofile 2009-06-05 15:50:16.000000000 +0000
5 @@ -1 +1,2 @@
6 La prima riga.
7 +La seconda riga.
8 </screen>
9 <!-- END extdiff.extdiff -->