Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/hg.py @ 705:574869103985
Merge with TAH
manifest hash: 197e0d1a0d7376a9eb72381330462f06490ab821
author | mpm@selenic.com |
---|---|
date | Thu, 14 Jul 2005 22:56:55 -0800 |
parents | 61c6b4178b9e fb6f85ecc863 |
children | 7c385bd5f993 9e0f3ba4a9c2 |
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 = 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)