# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2016-10-20 13:09:50
# Node ID 5f7d13d3bd4daa34fb64b447879a4630295a557c
# Parent  189a1030affb5456a58a9b99c5f2364793c69998

simplemerge: obtain stdout from ui

This will help Python 3 porting.

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -19,7 +19,6 @@
 from __future__ import absolute_import
 
 import os
-import sys
 
 from .i18n import _
 from . import (
@@ -441,7 +440,7 @@ def simplemerge(ui, local, base, other, 
         opener = scmutil.opener(os.path.dirname(local))
         out = opener(os.path.basename(local), "w", atomictemp=True)
     else:
-        out = sys.stdout
+        out = ui.fout
 
     m3 = Merge3Text(basetext, localtext, othertext)
     extrakwargs = {