hgbook

annotate it/examples/tour.merge.update.it @ 787:d511cb890aa9

find changesets by author, revision, files, or words in the commit message
Better translation of Mercurial abort message.
author Giulio@puck
date Tue Aug 11 18:08:00 2009 +0200 (2009-08-11)
parents 0bf0bf61493e
children 719b03ea27c8
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 -->