hgbook

view it/examples/tour.merge.merge.it @ 1049:e7ce6a9f50c7

find changesets by author, revision, files, or words in the commit message
end of git and begining of CVS translated
author zhaopingsun
date Tue Nov 10 15:52:41 2009 -0500 (2009-11-10)
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 -->