hgext/lfs/__init__.py
changeset 52060 8b7123c8947b
parent 51863 f4733654f144
--- a/hgext/lfs/__init__.py	Wed Oct 16 19:14:30 2024 +0200
+++ b/hgext/lfs/__init__.py	Tue Oct 01 13:49:11 2024 +0200
@@ -138,6 +138,7 @@
     filesetlang,
     localrepo,
     logcmdutil,
+    merge,
     minifileset,
     pycompat,
     revlog,
@@ -234,6 +235,7 @@
 
 @eh.uisetup
 def _uisetup(ui):
+    merge.MAYBE_USE_RUST_UPDATE = False
     localrepo.featuresetupfuncs.add(featuresetup)