hgbook

view it/examples/tour.merge.update.it @ 1067:dc51747713e8

2.3 zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Nov 11 20:25:20 2009 -0500 (2009-11-11)
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 -->