changeset 1427 | 0980d77f5e9a |
parent 1415 | c6e6ca96a033 |
child 1447 | 508a3f559553 |
--- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1304,7 +1304,7 @@ class localrepository: cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") or "hgmerge") - r = os.system("%s %s %s %s" % (cmd, a, b, c)) + r = os.system('%s "%s" "%s" "%s"' % (cmd, a, b, c)) if r: self.ui.warn(_("merging %s failed!\n") % fn)