--- a/mercurial/merge.py	Tue Jul 23 19:14:16 2024 -0400
+++ b/mercurial/merge.py	Tue Jul 23 19:20:22 2024 -0400
@@ -8,10 +8,17 @@
 
 import collections
 import struct
+import typing
 
 from .i18n import _
 from .node import nullrev
 from .thirdparty import attr
+
+# Force pytype to use the non-vendored package
+if typing.TYPE_CHECKING:
+    # noinspection PyPackageRequirements
+    import attr
+
 from .utils import stringutil
 from .dirstateutils import timestamp
 from . import (