hgbook

view it/examples/ch04-resolve.init.it @ 999:a6b81cd31cfd

find changesets by author, revision, files, or words in the commit message
adding complete.xml - which generated but Bryan did add it also - as I have absolutly no personnality I do as he does
author Romain PELISSE <belaran@gmail.com>
date Sat Sep 12 20:53:36 2009 +0200 (2009-09-12)
parents
children
line source
1 <!-- BEGIN ch04/resolve.init -->
2 <screen><prompt>$</prompt> <userinput>hg init conflitto</userinput>
3 <prompt>$</prompt> <userinput>cd conflitto</userinput>
4 <prompt>$</prompt> <userinput>echo primo &gt; miofile.txt</userinput>
5 <prompt>$</prompt> <userinput>hg ci -A -m primo</userinput>
6 aggiungo miofile.txt
7 <prompt>$</prompt> <userinput>cd ..</userinput>
8 <prompt>$</prompt> <userinput>hg clone conflitto sinistra</userinput>
9 aggiorno la directory di lavoro
10 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
11 <prompt>$</prompt> <userinput>hg clone conflitto destra</userinput>
12 aggiorno la directory di lavoro
13 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
14 </screen>
15 <!-- END ch04/resolve.init -->