Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/hg.py @ 691:61c6b4178b9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HG environment variables take precedence over hgrc manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810
author mpm@selenic.com
date Wed, 13 Jul 2005 01:48:03 -0800
parents f762860f82c6
children fb6f85ecc863 574869103985
line wrap: on
line diff
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1498,8 +1498,8 @@ class localrepository:
         self.ui.debug("file %s: other %s ancestor %s\n" %
                               (fn, short(other), short(base)))
 
-        cmd = self.ui.config("ui", "merge") or \
-              os.environ.get("HGMERGE", "hgmerge")
+        cmd = os.environ.get("HGMERGE", "hgmerge") or \
+              self.ui.config("ui", "merge")
         r = os.system("%s %s %s %s" % (cmd, a, b, c))
         if r:
             self.ui.warn("merging %s failed!\n" % fn)