##// END OF EJS Templates
vfs: use 'vfs' module directly in 'mercurial.simplemerge'...
Pierre-Yves David -
r31238:35284f93 default
parent child Browse files
Show More
@@ -24,8 +24,8 b' from .i18n import _'
24 from . import (
24 from . import (
25 error,
25 error,
26 mdiff,
26 mdiff,
27 scmutil,
28 util,
27 util,
28 vfs as vfsmod,
29 )
29 )
30
30
31 class CantReprocessAndShowBase(Exception):
31 class CantReprocessAndShowBase(Exception):
@@ -437,7 +437,7 b' def simplemerge(ui, local, base, other, '
437
437
438 local = os.path.realpath(local)
438 local = os.path.realpath(local)
439 if not opts.get('print'):
439 if not opts.get('print'):
440 opener = scmutil.vfs(os.path.dirname(local))
440 opener = vfsmod.vfs(os.path.dirname(local))
441 out = opener(os.path.basename(local), "w", atomictemp=True)
441 out = opener(os.path.basename(local), "w", atomictemp=True)
442 else:
442 else:
443 out = ui.fout
443 out = ui.fout
General Comments 0
You need to be logged in to leave comments. Login now