diff -r 279e217d6041 -r 45dc0f874b8c mercurial/merge.py
--- a/mercurial/merge.py	Mon Jan 06 20:02:17 2025 -0500
+++ b/mercurial/merge.py	Sun Jan 12 21:35:30 2025 -0500
@@ -11,7 +11,7 @@
 import os
 import struct
 import typing
-from typing import Dict, Optional, Tuple
+from typing import Dict, Iterator, Optional, Tuple
 
 from .i18n import _
 from .node import nullrev
@@ -673,7 +673,7 @@
 
         return sum(len(self._actionmapping[a]) for a in actions)
 
-    def filemap(self, sort=False):
+    def filemap(self, sort=False) -> Iterator[tuple]:  # TODO: fill out tuple
         if sort:
             yield from sorted(self._filemapping.items())
         else: