merge with stable

This commit is contained in:
Matt Mackall 2013-05-17 17:22:08 -05:00
commit 0e295e1642

View File

@ -181,7 +181,7 @@ class dirstate(object):
cwd = self.getcwd()
path = util.pathto(self._root, cwd, f)
if self._slash:
return util.normpath(path)
return util.pconvert(path)
return path
def __getitem__(self, key):