equal
deleted
inserted
replaced
1302 self.ui.debug(_("file %s: my %s other %s ancestor %s\n") % |
1302 self.ui.debug(_("file %s: my %s other %s ancestor %s\n") % |
1303 (fn, short(my), short(other), short(base))) |
1303 (fn, short(my), short(other), short(base))) |
1304 |
1304 |
1305 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") |
1305 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") |
1306 or "hgmerge") |
1306 or "hgmerge") |
1307 r = os.system("%s %s %s %s" % (cmd, a, b, c)) |
1307 r = os.system('%s "%s" "%s" "%s"' % (cmd, a, b, c)) |
1308 if r: |
1308 if r: |
1309 self.ui.warn(_("merging %s failed!\n") % fn) |
1309 self.ui.warn(_("merging %s failed!\n") % fn) |
1310 |
1310 |
1311 os.unlink(b) |
1311 os.unlink(b) |
1312 os.unlink(c) |
1312 os.unlink(c) |