hgbook

view it/examples/tour.merge.merge.it @ 1010:cd06c45e1631

find changesets by author, revision, files, or words in the commit message
French translation : ch06-collab.xml - about 50% translated
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Mon Sep 21 00:02:10 2009 +0200 (2009-09-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 -->