Show More
@@ -233,7 +233,8 b' def filemerge(repo, mynode, orig, fcd, f' | |||
|
233 | 233 | replace = dict(local=a, base=b, other=c, output=out) |
|
234 | 234 | args = util.interpolate(r'\$', replace, args, |
|
235 | 235 | lambda s: '"%s"' % util.localpath(s)) |
|
236 |
r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env |
|
|
236 | r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env, | |
|
237 | out=ui.fout) | |
|
237 | 238 | |
|
238 | 239 | if not r and (_toolbool(ui, tool, "checkconflicts") or |
|
239 | 240 | 'conflicts' in _toollist(ui, tool, "check")): |
General Comments 0
You need to be logged in to leave comments.
Login now