Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
694:51eb248d3348 | 705:574869103985 |
---|---|
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) |