hgbook

annotate it/examples/ch04-resolve.export.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 15eeeef467d2
children
rev   line source
Giulio@790 1 <!-- BEGIN ch04/resolve.export -->
Giulio@813 2 <screen><prompt>$</prompt> <userinput>export HGMERGE=false</userinput>
Giulio@790 3 </screen>
Giulio@790 4 <!-- END ch04/resolve.export -->