hgbook

view it/examples/tour.merge.update.it @ 991:e6894aa7baf2

French translation; ch04-concepts.xml; 10percent
author Jean-Marie Clément <JeanMarieClement@web.de>
date Mon Sep 07 23:16:08 2009 +0200 (2009-09-07)
parents 713f0f69029a d511cb890aa9
children
line source
1 <!-- BEGIN tour.merge.update -->
2 <screen><prompt>$</prompt> <userinput>hg update</userinput>
3 fallimento: attraversa i rami (usate 'hg merge' o 'hg update -C')
4 </screen>
5 <!-- END tour.merge.update -->