hgbook

view it/examples/ch04-resolve.cifail.it @ 1113:613690ad6a9c

find changesets by author, revision, files, or words in the commit message
Merge with dongsheng
author Bryan O'Sullivan <bos@serpentine.com>
date Sat Jul 10 16:21:26 2010 +0100 (2010-07-10)
parents 713f0f69029a 5bbebcdfb533
children
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 -->