hgbook
annotate 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 |
| rev | line source |
|---|---|
| Giulio@804 | 1 <!-- BEGIN extdiff.diff --> |
| Giulio@804 | 2 <screen><prompt>$</prompt> <userinput>hg diff</userinput> |
| Giulio@804 | 3 diff -r dc7b09ad1097 miofile |
| Giulio@804 | 4 --- a/miofile Fri Jun 05 15:50:16 2009 +0000 |
| Giulio@804 | 5 +++ b/miofile Fri Jun 05 15:50:17 2009 +0000 |
| Giulio@804 | 6 @@ -1,1 +1,2 @@ |
| Giulio@804 | 7 La prima riga. |
| Giulio@804 | 8 +La seconda riga. |
| Giulio@804 | 9 </screen> |
| Giulio@804 | 10 <!-- END extdiff.diff --> |