D12603: diff: graduate merge diffs from experimental and add to tweakdefaults

[durin42 (Augie Fackler)]

durin42 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I've been using this functionality for two years without incident and
  it's been outstanding. In my opinion it's time to both remove the
  experimental warning label and move this straight into tweakdefaults.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12603

AFFECTED FILES
  mercurial/configitems.py
  mercurial/ui.py

CHANGE DETAILS

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -81,6 +81,8 @@
 git = 1
 showfunc = 1
 word-diff = 1
+# use merge-diff functionality to make `diff` of a merge easier to understand
+merge = yes
 """
 
 samplehgrcs = {
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -774,7 +774,6 @@
     b'diff',
     b'merge',
     default=False,
-    experimental=True,
 )
 coreconfigitem(
     b'email',



To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel