Mercurial > public > mercurial-scm > hg-stable
diff mercurial/mergestate.py @ 47142:bea4717415c0
merge with stable
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Fri, 07 May 2021 22:06:25 -0400 |
| parents | d55b71393907 f38bf44e077f |
| children | 8b16ccc71001 |
line wrap: on
line diff
--- 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):