hgbook

view it/examples/tour.merge.update.it @ 917:93154fbaae9b

Merge with http://bitbucket.org/dukebody/hgbook-alqua/
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Oct 27 21:31:06 2009 -0700 (2009-10-27)
parents 0bf0bf61493e
children 719b03ea27c8
line source
1 <!-- BEGIN tour.merge.update -->
2 <screen><prompt>$</prompt> <userinput>hg update</userinput>
3 fallimento: attraversa i rami (usate 'hg merge' o 'hg update -C')
4 </screen>
5 <!-- END tour.merge.update -->