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