facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Fixed problem with invoking hgmerge on paths with spaces.

Browse Source
This commit is contained in:
michael.w.dales@intel.com 2005-10-24 14:54:17 -07:00
parent c0239b9f56
commit 287b19a2a6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/localrepo.py
View File

@ -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)