Show More
@@ -19,7 +19,6 b'' | |||||
19 | from __future__ import absolute_import |
|
19 | from __future__ import absolute_import | |
20 |
|
20 | |||
21 | import os |
|
21 | import os | |
22 | import sys |
|
|||
23 |
|
22 | |||
24 | from .i18n import _ |
|
23 | from .i18n import _ | |
25 | from . import ( |
|
24 | from . import ( | |
@@ -441,7 +440,7 b' def simplemerge(ui, local, base, other, ' | |||||
441 | opener = scmutil.opener(os.path.dirname(local)) |
|
440 | opener = scmutil.opener(os.path.dirname(local)) | |
442 | out = opener(os.path.basename(local), "w", atomictemp=True) |
|
441 | out = opener(os.path.basename(local), "w", atomictemp=True) | |
443 | else: |
|
442 | else: | |
444 |
out = |
|
443 | out = ui.fout | |
445 |
|
444 | |||
446 | m3 = Merge3Text(basetext, localtext, othertext) |
|
445 | m3 = Merge3Text(basetext, localtext, othertext) | |
447 | extrakwargs = { |
|
446 | extrakwargs = { |
General Comments 0
You need to be logged in to leave comments.
Login now