hgbook

view it/examples/ch04-resolve.cifail.it @ 982:a9c3a727f253

find changesets by author, revision, files, or words in the commit message
ch01-intro.xml : some errors corrected and translated the last few part untranslated
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Tue Sep 08 18:20:00 2009 +0200 (2009-09-08)
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 -->