Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/simplemerge.py
changeset 31238 35284f933518
parent 31216 21fa3d3688f3
child 33017 c31d45623304 
--- a/mercurial/simplemerge.py	Thu Mar 02 13:30:47 2017 +0100
+++ b/mercurial/simplemerge.py	Thu Mar 02 13:30:58 2017 +0100
@@ -24,8 +24,8 @@
 from . import (
     error,
     mdiff,
-    scmutil,
     util,
+    vfs as vfsmod,
 )
 
 class CantReprocessAndShowBase(Exception):
@@ -437,7 +437,7 @@
 
     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
mercurial