# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 2017-03-02 12:30:58
# Node ID 35284f9335184d8455ca4a53b1dca521824c51e8
# Parent  1b08aca7870af252232694e30ccb8f8bbb7f7ded

vfs: use 'vfs' module directly in 'mercurial.simplemerge'

Now that the 'vfs' classes moved in their own module, lets use the new module
directly. We update code iteratively to help with possible bisect needs in the
future.

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -24,8 +24,8 @@ from .i18n import _
 from . import (
     error,
     mdiff,
-    scmutil,
     util,
+    vfs as vfsmod,
 )
 
 class CantReprocessAndShowBase(Exception):
@@ -437,7 +437,7 @@ def simplemerge(ui, local, base, other, 
 
     local = os.path.realpath(local)
     if not opts.get('print'):
-        opener = scmutil.vfs(os.path.dirname(local))
+        opener = vfsmod.vfs(os.path.dirname(local))
         out = opener(os.path.basename(local), "w", atomictemp=True)
     else:
         out = ui.fout