# HG changeset patch
# User michael.w.dales@intel.com
# Date 1130190857 25200
# Node ID 0980d77f5e9a2664423109a0505a9c188709bac6
# Parent  e84c69b43cdb9652b57857ec85fc6e4ff441033e
Fixed problem with invoking hgmerge on paths with spaces.



diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- 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)