diff -r 5ffc6c18fb96 -r bea4717415c0 mercurial/mergestate.py
--- a/mercurial/mergestate.py	Fri May 07 08:38:17 2021 -0700
+++ b/mercurial/mergestate.py	Fri May 07 22:06:25 2021 -0400
@@ -306,11 +306,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):