# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1421194526 -3600
# Node ID 431d4f73249e73e4f2c7d85ae0a004504c4c1aac
# Parent  8908f985570c74a2fa0bd61554d7b5b673734f5e
merge: use repo.wvfs.unlinkpath

diff -r 8908f985570c -r 431d4f73249e mercurial/merge.py
--- a/mercurial/merge.py	Wed Jan 14 01:15:26 2015 +0100
+++ b/mercurial/merge.py	Wed Jan 14 01:15:26 2015 +0100
@@ -1060,8 +1060,7 @@
     yields tuples for progress updates
     """
     verbose = repo.ui.verbose
-    unlink = util.unlinkpath
-    wjoin = repo.wjoin
+    unlinkpath = repo.wvfs.unlinkpath
     audit = repo.wvfs.audit
     try:
         cwd = pycompat.getcwd()
@@ -1076,7 +1075,7 @@
             repo.ui.note(_("removing %s\n") % f)
         audit(f)
         try:
-            unlink(wjoin(f), ignoremissing=True)
+            unlinkpath(f, ignoremissing=True)
         except OSError as inst:
             repo.ui.warn(_("update failed to remove %s: %s!\n") %
                          (f, inst.strerror))