hgbook

annotate it/examples/ch04-resolve.export.it @ 790:3d5e63d5d180

find changesets by author, revision, files, or words in the commit message
Minor changes and translation of code snippets for Ch.5.
author Giulio@puck
date Tue Aug 11 21:53:03 2009 +0200 (2009-08-11)
parents
children 15eeeef467d2
rev   line source
Giulio@790 1 <!-- BEGIN ch04/resolve.export -->
Giulio@790 2 <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
Giulio@790 3 </screen>
Giulio@790 4 <!-- END ch04/resolve.export -->