# HG changeset patch
# User Idan Kamara <idankk86@gmail.com>
# Date 1308924277 -10800
# Node ID e3be7dc9a5e11d219a342defe79acd7e3b265eb6
# Parent  1b8c70c9f47c7156f7fdf36bd07c7c2386000e1f
filemerge: use ui out descriptor when calling util.system

diff -r 1b8c70c9f47c -r e3be7dc9a5e1 mercurial/filemerge.py
--- 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")):