hgbook

view it/examples/tour.merge.merge.it @ 1103:b6bb5b383887

find changesets by author, revision, files, or words in the commit message
2.8.1 first 2 para zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Nov 25 22:33:34 2009 -0500 (2009-11-25)
parents 0bf0bf61493e
children 719b03ea27c8
line source
1 <!-- BEGIN tour.merge.merge -->
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
3 unisco hello.c
4 0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti
5 (unione tra rami, ricordatevi di eseguire il commit)
6 </screen>
7 <!-- END tour.merge.merge -->