hgbook

diff it/examples/tour.merge.clone.it @ 846:29b47af6a275

Adding KDiff3 screenshot.
author gpiancastelli
date Sat Aug 22 17:02:37 2009 +0200 (2009-08-22)
parents 0bf0bf61493e
children 5bbebcdfb533
line diff
     1.1 --- a/it/examples/tour.merge.clone.it	Mon Aug 10 21:59:18 2009 +0200
     1.2 +++ b/it/examples/tour.merge.clone.it	Sat Aug 22 17:02:37 2009 +0200
     1.3 @@ -1,9 +1,9 @@
     1.4  <!-- BEGIN tour.merge.clone -->
     1.5  <screen><prompt>$</prompt> <userinput>cd ..</userinput>
     1.6 -<prompt>$</prompt> <userinput>hg clone hello my-new-hello</userinput>
     1.7 +<prompt>$</prompt> <userinput>hg clone hello mio-nuovo-hello</userinput>
     1.8  aggiorno la directory di lavoro
     1.9  2 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
    1.10 -<prompt>$</prompt> <userinput>cd my-new-hello</userinput>
    1.11 +<prompt>$</prompt> <userinput>cd mio-nuovo-hello</userinput>
    1.12  # Apportiamo alcune semplici modifiche a hello.c...
    1.13  <prompt>$</prompt> <userinput>mio-editor-di-testo hello.c</userinput>
    1.14  <prompt>$</prompt> <userinput>hg commit -m 'Un nuovo saluto per un nuovo giorno.'</userinput>