hgbook

view it/examples/tour.merge.merge.it @ 786:c09a6231bc79

find changesets by author, revision, files, or words in the commit message
Added code snippets I left behind from Ch.2.
author Giulio@puck
date Mon Aug 10 22:03:09 2009 +0200 (2009-08-10)
parents
children 1bd3a2ecb828
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 di rami, ricordatevi di eseguire il commit)
6 </screen>
7 <!-- END tour.merge.merge -->