hgbook

view it/examples/ch04-resolve.export.it @ 792:5b79834be9a6

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