Mercurial > hg
changeset 10533:184cdb66263e stable
filemerge: use native path separators when merging (issue1399)
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Tue, 23 Feb 2010 23:19:09 +0100 |
| parents | e3eff76552f1 |
| children | a957038218cd |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Tue Feb 23 11:37:40 2010 -0500 +++ b/mercurial/filemerge.py Tue Feb 23 23:19:09 2010 +0100 @@ -205,7 +205,7 @@ 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"):