hgbook
diff it/examples/ch04-resolve.init.it @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sun Dec 13 16:35:56 2009 +0900 (2009-12-13) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/it/examples/ch04-resolve.init.it Sun Dec 13 16:35:56 2009 +0900 1.3 @@ -0,0 +1,15 @@ 1.4 +<!-- BEGIN ch04/resolve.init --> 1.5 +<screen><prompt>$</prompt> <userinput>hg init conflitto</userinput> 1.6 +<prompt>$</prompt> <userinput>cd conflitto</userinput> 1.7 +<prompt>$</prompt> <userinput>echo primo > miofile.txt</userinput> 1.8 +<prompt>$</prompt> <userinput>hg ci -A -m primo</userinput> 1.9 +aggiungo miofile.txt 1.10 +<prompt>$</prompt> <userinput>cd ..</userinput> 1.11 +<prompt>$</prompt> <userinput>hg clone conflitto sinistra</userinput> 1.12 +aggiorno la directory di lavoro 1.13 +1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti 1.14 +<prompt>$</prompt> <userinput>hg clone conflitto destra</userinput> 1.15 +aggiorno la directory di lavoro 1.16 +1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti 1.17 +</screen> 1.18 +<!-- END ch04/resolve.init -->