# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1489020812 28800
# Node ID 102d3a30582c8345a6ae3f1d3f34633a9c256919
# Parent  4282feb794328be2d61b86e540f7f5a0f0c0a087
merge: directly use repo.vfs.join

The 'repo.join' method is about to be deprecated.

diff -r 4282feb79432 -r 102d3a30582c mercurial/merge.py
--- a/mercurial/merge.py	Wed Mar 08 16:53:24 2017 -0800
+++ b/mercurial/merge.py	Wed Mar 08 16:53:32 2017 -0800
@@ -124,7 +124,7 @@
             self._mdstate = 's'
         else:
             self._mdstate = 'u'
-        shutil.rmtree(self._repo.join('merge'), True)
+        shutil.rmtree(self._repo.vfs.join('merge'), True)
         self._results = {}
         self._dirty = False
 
@@ -1678,7 +1678,7 @@
             repo.setparents(fp1, fp2)
             recordupdates(repo, actions, branchmerge)
             # update completed, clear state
-            util.unlink(repo.join('updatestate'))
+            util.unlink(repo.vfs.join('updatestate'))
 
             if not branchmerge:
                 repo.dirstate.setbranch(p2.branch())