hgbook
annotate it/examples/extdiff.extdiff-ctx.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.extdiff-ctx --> |
| Giulio@804 | 2 <screen><prompt>$</prompt> <userinput>hg extdiff -o -NprcC5</userinput> |
| Giulio@804 | 3 *** a.dc7b09ad1097/miofile Fri Jun 5 15:50:18 2009 |
| Giulio@804 | 4 --- /tmp/a/miofile Fri Jun 5 15:50:16 2009 |
| Giulio@804 | 5 *************** |
| Giulio@804 | 6 *** 1 **** |
| Giulio@804 | 7 --- 1,2 ---- |
| Giulio@804 | 8 La prima riga. |
| Giulio@804 | 9 + La seconda riga. |
| Giulio@804 | 10 </screen> |
| Giulio@804 | 11 <!-- END extdiff.extdiff-ctx --> |