Mercurial > hg-stable

changeset 703:fb6f85ecc863

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 17:28:19 +0100
parents a1099c50a622
children 5ca319a641e1
files mercurial/hg.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)