annotate it/examples/tour.merge.update.it @ 785:0bf0bf61493e
Minor changes and translation of code snippets for Ch.3.
| author |
Giulio@puck |
| date |
Mon Aug 10 21:59:18 2009 +0200 (2009-08-10) |
| parents |
|
| children |
d511cb890aa9 |
| rev |
line source |
|
Giulio@785
|
1 <!-- BEGIN tour.merge.update -->
|
|
Giulio@785
|
2 <screen><prompt>$</prompt> <userinput>hg update</userinput>
|
|
Giulio@785
|
3 abortito: attraversa i rami (usate 'hg merge' o 'hg update -C')
|
|
Giulio@785
|
4 <!-- in realtà ... "aborto", n. più che agg. o p.p. -->
|
|
Giulio@785
|
5 </screen>
|
|
Giulio@785
|
6 <!-- END tour.merge.update -->
|
