diff -r 607e94e01851 -r f4733654f144 mercurial/simplemerge.py
--- a/mercurial/simplemerge.py	Mon Sep 16 15:36:38 2024 +0200
+++ b/mercurial/simplemerge.py	Mon Sep 16 15:36:44 2024 +0200
@@ -16,6 +16,7 @@
 # mbp: "you know that thing where cvs gives you conflict markers?"
 # s: "i hate that."
 
+from __future__ import annotations
 
 from .i18n import _
 from . import (