mercurial/simplemerge.py

--- a/mercurial/simplemerge.py	Mon Feb 21 13:03:43 2022 -0700
+++ b/mercurial/simplemerge.py	Mon Feb 21 13:08:28 2022 -0700
@@ -62,7 +62,7 @@
         return True
 
 
-class Merge3Text(object):
+class Merge3Text:
     """3-way merge of texts.
 
     Given strings BASE, OTHER, THIS, tries to produce a combined text
@@ -468,7 +468,7 @@
     return lines
 
 
-class MergeInput(object):
+class MergeInput:
     def __init__(self, fctx, label=None, label_detail=None):
         self.fctx = fctx
         self.label = label