hgbook
view it/examples/extdiff.diff.it @ 1113:613690ad6a9c
Merge with dongsheng
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sat Jul 10 16:21:26 2010 +0100 (2010-07-10) |
| parents | |
| children |
line source
1 <!-- BEGIN extdiff.diff -->
2 <screen><prompt>$</prompt> <userinput>hg diff</userinput>
3 diff -r dc7b09ad1097 miofile
4 --- a/miofile Fri Jun 05 15:50:16 2009 +0000
5 +++ b/miofile Fri Jun 05 15:50:17 2009 +0000
6 @@ -1,1 +1,2 @@
7 La prima riga.
8 +La seconda riga.
9 </screen>
10 <!-- END extdiff.diff -->