hgbook

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