hgbook

annotate it/examples/ch04-resolve.export.it @ 813:15eeeef467d2

find changesets by author, revision, files, or words in the commit message
Wording and some other miscellaneous changes.
author Giulio@puck
date Sat Aug 15 17:22:37 2009 +0200 (2009-08-15)
parents 3d5e63d5d180
children 719b03ea27c8
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 -->