Show More
@@ -205,7 +205,7 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
205 | out, a = a, back # read input from backup, write to original |
|
205 | out, a = a, back # read input from backup, write to original | |
206 | replace = dict(local=a, base=b, other=c, output=out) |
|
206 | replace = dict(local=a, base=b, other=c, output=out) | |
207 | args = re.sub("\$(local|base|other|output)", |
|
207 | args = re.sub("\$(local|base|other|output)", | |
208 |
|
|
208 | lambda x: '"%s"' % util.localpath(replace[x.group()[1:]]), args) | |
209 | r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env) |
|
209 | r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env) | |
210 |
|
210 | |||
211 | if not r and _toolbool(ui, tool, "checkconflicts"): |
|
211 | if not r and _toolbool(ui, tool, "checkconflicts"): |
General Comments 0
You need to be logged in to leave comments.
Login now