hgbook
annotate it/examples/extdiff.diff.it @ 1011:a05a5ae66c38
merge
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Mon Nov 23 10:51:14 2009 +0100 (2009-11-23) |
| 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 --> |