hgbook

view it/examples/ch04-resolve.cifail.it @ 990:b4ff7b04efdc

find changesets by author, revision, files, or words in the commit message
French translation : corrected some mistakes in ch05-daily
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Thu Sep 10 14:45:17 2009 +0200 (2009-09-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 -->