--- a/mercurial/mergestate.py Tue May 04 13:28:42 2021 -0400
+++ b/mercurial/mergestate.py Fri Apr 30 16:13:02 2021 -0700
@@ -307,11 +307,11 @@
yield f
def allextras(self):
- """ return all extras information stored with the mergestate """
+ """return all extras information stored with the mergestate"""
return self._stateextras
def extras(self, filename):
- """ return extras stored with the mergestate for the given filename """
+ """return extras stored with the mergestate for the given filename"""
return self._stateextras[filename]
def _resolve(self, preresolve, dfile, wctx):