1700 self.ui.debug(_("file %s: my %s other %s ancestor %s\n") % |
1700 self.ui.debug(_("file %s: my %s other %s ancestor %s\n") % |
1701 (fn, short(my), short(other), short(base))) |
1701 (fn, short(my), short(other), short(base))) |
1702 |
1702 |
1703 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") |
1703 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") |
1704 or "hgmerge") |
1704 or "hgmerge") |
1705 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), |
1705 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=self.root, |
1706 environ={'HG_ROOT': self.root, |
1706 environ={'HG_FILE': fn, |
1707 'HG_FILE': fn, |
|
1708 'HG_MY_NODE': p1, |
1707 'HG_MY_NODE': p1, |
1709 'HG_OTHER_NODE': p2, |
1708 'HG_OTHER_NODE': p2, |
1710 'HG_FILE_MY_NODE': hex(my), |
1709 'HG_FILE_MY_NODE': hex(my), |
1711 'HG_FILE_OTHER_NODE': hex(other), |
1710 'HG_FILE_OTHER_NODE': hex(other), |
1712 'HG_FILE_BASE_NODE': hex(base)}) |
1711 'HG_FILE_BASE_NODE': hex(base)}) |