equal
deleted
inserted
replaced
1496 |
1496 |
1497 self.ui.note("resolving %s\n" % fn) |
1497 self.ui.note("resolving %s\n" % fn) |
1498 self.ui.debug("file %s: other %s ancestor %s\n" % |
1498 self.ui.debug("file %s: other %s ancestor %s\n" % |
1499 (fn, short(other), short(base))) |
1499 (fn, short(other), short(base))) |
1500 |
1500 |
1501 cmd = os.environ.get("HGMERGE", "hgmerge") or \ |
1501 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") |
1502 self.ui.config("ui", "merge") |
1502 or "hgmerge") |
1503 r = os.system("%s %s %s %s" % (cmd, a, b, c)) |
1503 r = os.system("%s %s %s %s" % (cmd, a, b, c)) |
1504 if r: |
1504 if r: |
1505 self.ui.warn("merging %s failed!\n" % fn) |
1505 self.ui.warn("merging %s failed!\n" % fn) |
1506 |
1506 |
1507 os.unlink(b) |
1507 os.unlink(b) |