Mercurial Mercurial > public > mercurial-scm > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 52981 1a99bdbdb71b
parent 52974 ea9846b8e539 
--- a/mercurial/merge.py	Tue Feb 18 11:47:51 2025 +0100
+++ b/mercurial/merge.py	Tue Feb 18 11:48:54 2025 +0100
@@ -53,7 +53,7 @@
     """The merge action, data about the merge, and message about the merge, for
     the keyed file."""
 
-rust_update_mod = policy.importrust("update")
+rust_update_mod = policy.importrust("update", pyo3=True)
 
 _pack = struct.pack
 _unpack = struct.unpack
mercurial-scm/hg