hgbook
annotate it/examples/ch04-resolve.cifail.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 | 713f0f69029a 5bbebcdfb533 |
children |
rev | line source |
---|---|
Giulio@790 | 1 <!-- BEGIN ch04/resolve.cifail --> |
gpiancastelli@850 | 2 <screen><prompt>$</prompt> <userinput>hg commit -m "Tentativo di inserire i risultati di un'unione fallita."</userinput> |
Giulio@790 | 3 fallimento: conflitti di unione irrisolti (si veda hg resolve) |
Giulio@790 | 4 </screen> |
Giulio@790 | 5 <!-- END ch04/resolve.cifail --> |