hgbook

view it/examples/tour.merge.merge.it @ 1027:a122f4c9a75b

find changesets by author, revision, files, or words in the commit message
moving xsl to appropriate folder
author Romain Pelisse <belaran@gmail.com>
date Wed Apr 21 18:28:16 2010 +0200 (2010-04-21)
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 -->