hgbook

view it/examples/ch04-resolve.cifail.it @ 976:713f0f69029a

find changesets by author, revision, files, or words in the commit message
merge with Italian, and very (few) work on ch03
author Romain PELISSE <belaran@gmail.com>
date Fri Sep 04 16:33:35 2009 +0200 (2009-09-04)
parents
children 719b03ea27c8
line source
1 <!-- BEGIN ch04/resolve.cifail -->
2 <screen><prompt>$</prompt> <userinput>hg commit -m "Tentativo di inserire i risultati di un'unione fallita."</userinput>
3 fallimento: conflitti di unione irrisolti (si veda hg resolve)
4 </screen>
5 <!-- END ch04/resolve.cifail -->