hgbook

view it/examples/tour.merge.update.it @ 1027:a122f4c9a75b

moving xsl to appropriate folder
author Romain Pelisse <belaran@gmail.com>
date Wed Apr 21 18:28:16 2010 +0200 (2010-04-21)
parents 713f0f69029a d511cb890aa9
children
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 -->