Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: use ui out descriptor when calling util.system stable
authorIdan Kamara <idankk86@gmail.com>
Fri, 24 Jun 2011 17:04:37 +0300
branchstable
changeset 14749 e3be7dc9a5e1
parent 14748 1b8c70c9f47c
child 14750 f5f97a0f983f
filemerge: use ui out descriptor when calling util.system
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- 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")):
mercurial