hgbook
annotate it/examples/extdiff.diff.it @ 993:71dbda516572
French translation : merge with Jean Marie Clement's work on ch04-concepts
| author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
|---|---|
| date | Fri Sep 11 14:35:36 2009 +0200 (2009-09-11) |
| 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 --> |