diff mercurial/helptext/config.txt @ 48681:e845537f6adb

branching: merge stable into default

--- a/mercurial/helptext/config.txt	Wed Jan 26 15:32:18 2022 -0800
+++ b/mercurial/helptext/config.txt	Wed Feb 02 17:24:05 2022 +0100
@@ -915,7 +915,7 @@
 
     Enabled by default.
 
-``exp-rc-dirstate-v2``
+``use-dirstate-v2``
     Enable or disable the experimental "dirstate-v2" feature. The dirstate
     functionality is shared by all commands interacting with the working copy.
     The new version is more robust, faster and stores more information.
@@ -939,7 +939,7 @@
 
     $ hg debugupgraderepo \
           --run \
-          --config format.exp-rc-dirstate-v2=False \
+          --config format.use-dirstate-v2=False \
           --config storage.dirstate-v2.slow-path=allow
 
     For a more comprehensive guide, see :hg:`help internals.dirstate-v2`.