diff -r a8b17859684a -r 20a42325fdef mercurial/merge.py
--- a/mercurial/merge.py	Wed Aug 17 20:57:15 2016 -0700
+++ b/mercurial/merge.py	Wed Nov 23 00:03:11 2016 +0530
@@ -28,6 +28,7 @@
     error,
     filemerge,
     obsolete,
+    pycompat,
     scmutil,
     subrepo,
     util,
@@ -1040,7 +1041,7 @@
     wjoin = repo.wjoin
     audit = repo.wvfs.audit
     try:
-        cwd = os.getcwd()
+        cwd = pycompat.getcwd()
     except OSError as err:
         if err.errno != errno.ENOENT:
             raise
@@ -1066,7 +1067,7 @@
         # cwd was present before we started to remove files
         # let's check if it is present after we removed them
         try:
-            os.getcwd()
+            pycompat.getcwd()
         except OSError as err:
             if err.errno != errno.ENOENT:
                 raise