1.1 --- a/en/examples/run-example	Thu Oct 19 15:18:07 2006 -0700
     1.2 +++ b/en/examples/run-example	Tue Dec 26 13:08:20 2006 -0800
     1.3 @@ -135,6 +135,7 @@
     1.4          print >> rcfp, 'PS2="%s"' % self.ps2
     1.5          print >> rcfp, 'unset HISTFILE'
     1.6          print >> rcfp, 'export EXAMPLE_DIR="%s"' % os.getcwd()
     1.7 +        print >> rcfp, 'export HGMERGE=merge'
     1.8          print >> rcfp, 'export LANG=C'
     1.9          print >> rcfp, 'export LC_ALL=C'
    1.10          print >> rcfp, 'export TZ=GMT'