Mercurial > public > mercurial-scm > hg-stable

diff mercurial/simplemerge.py @ 30333:5f7d13d3bd4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: obtain stdout from ui This will help Python 3 porting.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 20 Oct 2016 22:09:50 +0900
parents c3e9269d9602
children 318a24b52eeb
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Thu Oct 20 22:07:03 2016 +0900
+++ b/mercurial/simplemerge.py	Thu Oct 20 22:09:50 2016 +0900
@@ -19,7 +19,6 @@
 from __future__ import absolute_import
 
 import os
-import sys
 
 from .i18n import _
 from . import (
@@ -441,7 +440,7 @@
         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 = {