Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/filemerge.py @ 49037:642e31cb55f0
py3: use class X: instead of class X(object):
The inheritance from object is implied in Python 3. So this should
be equivalent.
This change was generated via an automated search and replace. So there
may have been some accidental changes.
Differential Revision: https://phab.mercurial-scm.org/D12352
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 21 Feb 2022 13:08:28 -0700 |
| parents | f254fc73d956 |
| children | 4057563ebc6b |
comparison
equal
deleted
inserted
replaced
| 49036:55d132525155 | 49037:642e31cb55f0 |
|---|---|
| 82 b"What do you want to do?" | 82 b"What do you want to do?" |
| 83 b"$$ &Changed $$ &Deleted $$ &Unresolved" | 83 b"$$ &Changed $$ &Deleted $$ &Unresolved" |
| 84 ) | 84 ) |
| 85 | 85 |
| 86 | 86 |
| 87 class absentfilectx(object): | 87 class absentfilectx: |
| 88 """Represents a file that's ostensibly in a context but is actually not | 88 """Represents a file that's ostensibly in a context but is actually not |
| 89 present in it. | 89 present in it. |
| 90 | 90 |
| 91 This is here because it's very specific to the filemerge code for now -- | 91 This is here because it's very specific to the filemerge code for now -- |
| 92 other code is likely going to break with the values this returns.""" | 92 other code is likely going to break with the values this returns.""" |