diff mercurial/configitems.py @ 38857:96d0795bd0bd

resolve: graduate resolve.mark-check from experimental, add docs

Since this hasn't been in a release yet, I'm not bothering to add an alias for
the experimental name of the config variable.

Differential Revision: https://phab.mercurial-scm.org/D4071

--- a/mercurial/configitems.py	Mon Apr 16 23:49:38 2018 -0700
+++ b/mercurial/configitems.py	Fri Aug 03 12:57:44 2018 -0700
@@ -193,6 +193,9 @@
 coreconfigitem('commands', 'resolve.confirm',
     default=False,
 )
+coreconfigitem('commands', 'resolve.mark-check',
+    default=None,
+)
 coreconfigitem('commands', 'show.aliasprefix',
     default=list,
 )
@@ -940,9 +943,6 @@
     default=True,
     alias=[('format', 'aggressivemergedeltas')],
 )
-coreconfigitem('experimental', 'resolve.mark-check',
-    default=None,
-)
 coreconfigitem('server', 'bookmarks-pushkey-compat',
     default=True,
 )