annotate it/examples/tour.merge.update.it @ 1032:a55f319bcc67
Merge with Romain Pelisse
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Sat Jul 10 06:24:49 2010 +0100 (2010-07-10) |
| 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 -->
|
