hgbook

diff it/examples/ch04-resolve.export.it @ 1096:4f880472a4b1

find changesets by author, revision, files, or words in the commit message
2.7.1.1 2 paras
author Zhaoping Sun <zhaopingsun@gmail.com>
date Tue Nov 24 08:05:50 2009 -0500 (2009-11-24)
parents 3d5e63d5d180
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/ch04-resolve.export.it	Tue Aug 11 21:53:03 2009 +0200
     1.2 +++ b/it/examples/ch04-resolve.export.it	Tue Nov 24 08:05:50 2009 -0500
     1.3 @@ -1,4 +1,4 @@
     1.4  <!-- BEGIN ch04/resolve.export -->
     1.5 -<screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
     1.6 +<screen><prompt>$</prompt> <userinput>export HGMERGE=false</userinput>
     1.7  </screen>
     1.8  <!-- END ch04/resolve.export -->