# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2010-02-23 22:19:09
# Node ID 184cdb66263e3ea7558053089be2bff8392eb62a
# Parent  e3eff76552f14981501454cc173411d756a9bf24

filemerge: use native path separators when merging (issue1399)

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -205,7 +205,7 @@ def filemerge(repo, mynode, orig, fcd, f
             out, a = a, back # read input from backup, write to original
         replace = dict(local=a, base=b, other=c, output=out)
         args = re.sub("\$(local|base|other|output)",
-                      lambda x: '"%s"' % replace[x.group()[1:]], args)
+            lambda x: '"%s"' % util.localpath(replace[x.group()[1:]]), args)
         r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env)
 
     if not r and _toolbool(ui, tool, "checkconflicts"):