hgbook

annotate it/examples/ch04-resolve.export.it @ 996:6f8c48362758

find changesets by author, revision, files, or words in the commit message
merge with trunk
author Romain PELISSE <belaran@gmail.com>
date Sat Sep 12 17:58:56 2009 +0200 (2009-09-12)
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 -->