# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1704300987 10800
# Node ID 6940272bc07d619120e202f933bdbd39989a926a
# Parent  991cbf0f66f2dffce9ab0675b6c8965f4e3ba94e# Parent  c8779efa4fb4beac703908976f6a7e0d2aced45f
branching: merge with stable

diff -r 991cbf0f66f2 -r 6940272bc07d hgext3rd/evolve/rewriteutil.py
--- a/hgext3rd/evolve/rewriteutil.py	Tue Dec 26 16:02:05 2023 -0300
+++ b/hgext3rd/evolve/rewriteutil.py	Wed Jan 03 13:56:27 2024 -0300
@@ -234,7 +234,7 @@
     return repomarks, revs
 
 try:
-    from mercural import mergestate
+    from mercurial import mergestate
     mergestate.memmergestate
     hasmemmergestate = True
 except (ImportError, AttributeError):