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