changeset 52057 | 43e15277498e |
parent 52056 | 8b7123c8947b |
child 52186 | e6a44bc91bc2 |
--- a/mercurial/merge.py Tue Oct 01 13:49:11 2024 +0200 +++ b/mercurial/merge.py Wed Oct 16 17:21:03 2024 +0200 @@ -35,7 +35,6 @@ pathutil, policy, pycompat, - requirements, scmutil, subrepoutil, util, @@ -2024,6 +2023,7 @@ update_from_null_fallback = False if ( MAYBE_USE_RUST_UPDATE + and repo.ui.configbool(b"rust", b"update-from-null") and rust_update_mod is not None and p1.rev() == nullrev and not branchmerge