hgbook

view it/examples/tour.merge.update.it @ 805:c35067358254

Minor adjustments to code snippets for diffs and temporary directory.
author Giulio@puck
date Sat Aug 15 03:10:19 2009 +0200 (2009-08-15)
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 -->