changeset 705 | 574869103985 |
parent 691 | 61c6b4178b9e |
parent 703 | fb6f85ecc863 |
child 713 | 7c385bd5f993 |
child 723 | 9e0f3ba4a9c2 |
--- a/mercurial/hg.py Thu Jul 14 22:37:46 2005 -0800 +++ b/mercurial/hg.py Thu Jul 14 22:56:55 2005 -0800 @@ -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)