hgbook

view it/examples/tour.merge.merge.it @ 1008:df8efd83cfc9

find changesets by author, revision, files, or words in the commit message
french : corrections on ch04, <quote>...
author William Dodé <wilk@flibuste.net>
date Thu Sep 17 10:30:33 2009 +0200 (2009-09-17)
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 -->