hgbook
diff it/examples/ch04-resolve.merge.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.merge.it Sun Dec 13 16:35:56 2009 +0900 1.3 @@ -0,0 +1,9 @@ 1.4 +<!-- BEGIN ch04/resolve.merge --> 1.5 +<screen><prompt>$</prompt> <userinput>hg merge</userinput> 1.6 +unisco miofile.txt 1.7 +merge: attenzione: conflitti durante l'unione 1.8 +unione di miofile.txt fallita! 1.9 +0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti 1.10 +usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare 1.11 +</screen> 1.12 +<!-- END ch04/resolve.merge -->