Skip to content
Snippets Groups Projects
Commit 5f7d13d3 authored by Yuya Nishihara's avatar Yuya Nishihara
Browse files

simplemerge: obtain stdout from ui

This will help Python 3 porting.
parent 189a1030
No related branches found
No related tags found
No related merge requests found
......@@ -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 = {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment