changeset 39823 | 24e493ec2229 |
parent 39481 | 3dd34b401bc2 |
child 41042 | 54c3b4bd01f2 |
--- a/mercurial/merge.py Mon Sep 24 22:46:22 2018 -0400 +++ b/mercurial/merge.py Fri Sep 21 19:48:23 2018 -0400 @@ -27,6 +27,7 @@ ) from . import ( copies, + encoding, error, filemerge, match as matchmod, @@ -1436,7 +1437,7 @@ def _getcwd(): try: - return pycompat.getcwd() + return encoding.getcwd() except OSError as err: if err.errno == errno.ENOENT: return None