mercurial/merge.py
changeset 48946 642e31cb55f0
parent 48927 c17aee610bab
child 49306 2e726c934fcd
--- a/mercurial/merge.py	Mon Feb 21 13:03:43 2022 -0700
+++ b/mercurial/merge.py	Mon Feb 21 13:08:28 2022 -0700
@@ -66,7 +66,7 @@
     )
 
 
-class _unknowndirschecker(object):
+class _unknowndirschecker:
     """
     Look for any unknown files or directories that may have a path conflict
     with a file.  If any path prefix of the file exists as a file or link,
@@ -537,7 +537,7 @@
             raise error.StateError(msg % f)
 
 
-class mergeresult(object):
+class mergeresult:
     """An object representing result of merging manifests.
 
     It has information about what actions need to be performed on dirstate
@@ -1467,7 +1467,7 @@
 
 
 @attr.s(frozen=True)
-class updateresult(object):
+class updateresult:
     updatedcount = attr.ib()
     mergedcount = attr.ib()
     removedcount = attr.ib()