Mercurial > public > mercurial-scm > hg-stable
diff relnotes/next @ 46548:d57e607d9e33
diff: replace --merge option by config option
I can't think of any reason you'd want to enable the merge diff on a
run-to-run basis; you'd probably either always or never want it set
(though I can't see why you'd never want it set). If you have it set,
you'll probably also want the same output in `hg log -p`
output. Having a single config option for the feature makes sense.
Differential Revision: https://phab.mercurial-scm.org/D9956
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 04 Feb 2021 13:05:51 -0800 |
| parents | 6b847757dd8d |
| children | 3caa3698335e |
line wrap: on
line diff
--- a/relnotes/next Thu Dec 24 11:21:23 2020 -0500 +++ b/relnotes/next Thu Feb 04 13:05:51 2021 -0800 @@ -8,10 +8,10 @@ == New Experimental Features == - * `hg diff` now takes an experimental `--merge` flag which causes `hg - diff --change` to show the changes relative to an automerge for - merge changesets. This makes it easier to detect and review manual - changes performed in merge changesets. + * There's a new `diff.merge` config option to show the changes + relative to an automerge for merge changesets. This makes it + easier to detect and review manual changes performed in merge + changesets. It is only supported by `hg diff --change` so far. == Bug Fixes ==