--- a/mercurial/merge.py	Tue Jul 04 23:13:47 2017 +0900
+++ b/mercurial/merge.py	Tue Jul 04 22:35:52 2017 -0700
@@ -9,7 +9,6 @@
 
 import errno
 import hashlib
-import os
 import shutil
 import struct
 
@@ -1206,7 +1205,7 @@
 
     # remove renamed files after safely stored
     for f in moves:
-        if os.path.lexists(repo.wjoin(f)):
+        if wctx[f].lexists():
             repo.ui.debug("removing %s\n" % f)
             wctx[f].audit()
             wctx[f].remove()