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