hgbook

view it/examples/ch04-resolve.cifail.it @ 794:80e5a41352d7

find changesets by author, revision, files, or words in the commit message
Validation typos.
author Giulio@puck
date Wed Aug 12 23:47:34 2009 +0200 (2009-08-12)
parents
children 5bbebcdfb533
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 -->