hgbook

view it/examples/ch04-resolve.cifail.it @ 791:bf84d6b2281c

find changesets by author, revision, files, or words in the commit message
Minor changes and translation of code snippets for Ch.7.
author Giulio@puck
date Tue Aug 11 23:01:30 2009 +0200 (2009-08-11)
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 -->