Mercurial > public > mercurial-scm > hg-stable

diff mercurial/configitems.py @ 38896:96d0795bd0bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Kyle Lippincott <spectral@google.com>
date Fri, 03 Aug 2018 12:57:44 -0700
parents 7848f284b211
children 7e75777e4a51
line wrap: on
line diff
--- 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,
 )