hgbook

view it/examples/tour.merge.update.it @ 1084:136342c64c09

find changesets by author, revision, files, or words in the commit message
2.4.2 zh translated finished
author Zhaoping Sun <zhaopingsun@gmail.com>
date Fri Nov 20 07:44:53 2009 -0500 (2009-11-20)
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 -->