hgbook

view it/examples/tour.merge.merge.it @ 1032:a55f319bcc67

find changesets by author, revision, files, or words in the commit message
Merge with Romain Pelisse
author Bryan O'Sullivan <bos@serpentine.com>
date Sat Jul 10 06:24:49 2010 +0100 (2010-07-10)
parents 713f0f69029a 1bd3a2ecb828
children
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 -->