Mercurial > hgbook

diff en/examples/run-example @ 124:c9aad709bd3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Document the backout command.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 26 Dec 2006 13:08:20 -0800
parents 5b80c922ebdd
children 7b5894fffc37
line wrap: on
line diff
--- a/en/examples/run-example	Tue Dec 26 09:59:12 2006 -0800
+++ b/en/examples/run-example	Tue Dec 26 13:08:20 2006 -0800
@@ -135,6 +135,7 @@
         print >> rcfp, 'PS2="%s"' % self.ps2
         print >> rcfp, 'unset HISTFILE'
         print >> rcfp, 'export EXAMPLE_DIR="%s"' % os.getcwd()
+        print >> rcfp, 'export HGMERGE=merge'
         print >> rcfp, 'export LANG=C'
         print >> rcfp, 'export LC_ALL=C'
         print >> rcfp, 'export TZ=GMT'