# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1121358499 -3600
# Node ID fb6f85ecc863dad7b86cd76d547dc52b22761cdc
# Parent  a1099c50a62247cc02a32f69eaf164b534b45aa9
merge program setting from hgrc wasn't used.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

merge program setting from hgrc wasn't used.

manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd
Xr+Tb86zo+xFhHq7YkDvLak=
=+BY9
-----END PGP SIGNATURE-----


diff -r a1099c50a622 -r fb6f85ecc863 mercurial/hg.py
--- a/mercurial/hg.py	Thu Jul 14 17:22:20 2005 +0100
+++ b/mercurial/hg.py	Thu Jul 14 17:28:19 2005 +0100
@@ -1498,8 +1498,8 @@
         self.ui.debug("file %s: other %s ancestor %s\n" %
                               (fn, short(other), short(base)))
 
-        cmd = os.environ.get("HGMERGE", "hgmerge") or \
-              self.ui.config("ui", "merge")
+        cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge")
+               or "hgmerge")
         r = os.system("%s %s %s %s" % (cmd, a, b, c))
         if r:
             self.ui.warn("merging %s failed!\n" % fn)