Mercurial > hg
changeset 14749:e3be7dc9a5e1 stable
filemerge: use ui out descriptor when calling util.system
| author | Idan Kamara <idankk86@gmail.com> |
|---|---|
| date | Fri, 24 Jun 2011 17:04:37 +0300 |
| parents | 1b8c70c9f47c |
| children | f5f97a0f983f |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Fri Jun 24 12:16:14 2011 +0300 +++ b/mercurial/filemerge.py Fri Jun 24 17:04:37 2011 +0300 @@ -233,7 +233,8 @@ replace = dict(local=a, base=b, other=c, output=out) args = util.interpolate(r'\$', replace, args, lambda s: '"%s"' % util.localpath(s)) - r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env) + r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env, + out=ui.fout) if not r and (_toolbool(ui, tool, "checkconflicts") or 'conflicts' in _toollist(ui, tool, "check")):