diff mercurial/configitems.py @ 38591:be441eb65f09

diff: graduate word-diff option from experimental

Per 4.6 Sprint notes.

I've also made it gated by "formatchanging" since it could change the output
if we had an option to highlight words without using colors.

--- a/mercurial/configitems.py	Fri Jul 06 12:47:02 2018 -0700
+++ b/mercurial/configitems.py	Sun Jul 08 16:21:26 2018 +0900
@@ -147,6 +147,9 @@
 coreconfigitem('annotate', 'noprefix',
     default=False,
 )
+coreconfigitem('annotate', 'word-diff',
+    default=False,
+)
 coreconfigitem('auth', 'cookiefile',
     default=None,
 )
@@ -399,6 +402,9 @@
 coreconfigitem('diff', 'noprefix',
     default=False,
 )
+coreconfigitem('diff', 'word-diff',
+    default=False,
+)
 coreconfigitem('email', 'bcc',
     default=None,
 )
@@ -512,9 +518,6 @@
 coreconfigitem('experimental', 'evolution.track-operation',
     default=True,
 )
-coreconfigitem('experimental', 'worddiff',
-    default=False,
-)
 coreconfigitem('experimental', 'maxdeltachainspan',
     default=-1,
 )