--- a/mercurial/commands.py Thu Dec 24 11:21:23 2020 -0500
+++ b/mercurial/commands.py Thu Feb 04 13:05:51 2021 -0800
@@ -2465,16 +2465,6 @@
(b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
(b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
(b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
- (
- b'',
- b'merge',
- False,
- _(
- b'show difference between auto-merge and committed '
- b'merge for merge commits (EXPERIMENTAL)'
- ),
- _(b'REV'),
- ),
]
+ diffopts
+ diffopts2
@@ -2555,7 +2545,7 @@
to_rev = opts.get(b'to')
stat = opts.get(b'stat')
reverse = opts.get(b'reverse')
- diffmerge = opts.get(b'merge')
+ diffmerge = ui.configbool(b'diff', b'merge')
cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])