Giulio@785: <!-- BEGIN tour.merge.update -->
Giulio@785: <screen><prompt>$</prompt> <userinput>hg update</userinput>
Giulio@787: fallimento: attraversa i rami (usate 'hg merge' o 'hg update -C')
Giulio@785: </screen>
Giulio@785: <!-- END tour.merge.update -->