--- a/mercurial/interfaces/dirstate.py	Tue Aug 24 21:11:42 2021 +0200
+++ b/mercurial/interfaces/dirstate.py	Tue Aug 24 21:11:57 2021 +0200
@@ -132,9 +132,6 @@
     def copies():
         pass
 
-    def merge(f):
-        '''Mark a file merged.'''
-
     def drop(f):
         '''Drop a file from the dirstate'''