--- a/mercurial/filemerge.py	Thu Aug 31 23:56:15 2023 +0200
+++ b/mercurial/filemerge.py	Fri Sep 01 00:09:55 2023 +0200
@@ -16,9 +16,6 @@
     hex,
     short,
 )
-from .pycompat import (
-    getattr,
-)
 
 from . import (
     encoding,