log mercurial/hg.py @ 703:fb6f85ecc863

age author description
Thu, 14 Jul 2005 17:28:19 +0100 Thomas Arendsen Hein merge program setting from hgrc wasn't used.
Wed, 13 Jul 2005 01:48:03 -0800 mpm HG environment variables take precedence over hgrc
Wed, 13 Jul 2005 01:46:50 -0800 mpm Minor merge fixups