branching: merge stable into default
authorPierre-Yves David <pierre-yves.david@octobus.net>
Sat, 26 Oct 2024 04:16:00 +0200
changeset 52113 b2e90465daf6
parent 52103 97840154eee3 (current diff)
parent 52112 71044315a536 (diff)
child 52114 7332eae326de
branching: merge stable into default
mercurial/utils/resourceutil.py
rust/hg-core/src/matchers.rs
tests/hghave.py
tests/test-demandimport.py
tests/test-doctest.py
--- a/mercurial/utils/resourceutil.py	Sat Oct 26 02:04:31 2024 +0200
+++ b/mercurial/utils/resourceutil.py	Sat Oct 26 04:16:00 2024 +0200
@@ -13,6 +13,8 @@
 import sys
 import typing
 
+from typing import Iterator
+
 from .. import pycompat