annotate it/examples/tour.merge.update.it @ 982:a9c3a727f253
ch01-intro.xml : some errors corrected and translated the last few part untranslated
| author |
Frédéric Bouquet <youshe.jaalon@gmail.com> |
| date |
Tue Sep 08 18:20:00 2009 +0200 (2009-09-08) |
| parents |
713f0f69029a d511cb890aa9 |
| children |
|
| rev |
line source |
|
Giulio@785
|
1 <!-- BEGIN tour.merge.update -->
|
|
Giulio@785
|
2 <screen><prompt>$</prompt> <userinput>hg update</userinput>
|
|
Giulio@787
|
3 fallimento: attraversa i rami (usate 'hg merge' o 'hg update -C')
|
|
Giulio@785
|
4 </screen>
|
|
Giulio@785
|
5 <!-- END tour.merge.update -->
|
