# HG changeset patch # User Augie Fackler # Date 1612217604 18000 # Node ID 6b847757dd8d344ce1805e7230fddf8b1b6c2a83 # Parent 1c66795862cf76e985e7d187df2f5b04fc8c25fb relnotes: add entry for `hg diff --merge -c` Differential Revision: https://phab.mercurial-scm.org/D9944 diff -r 1c66795862cf -r 6b847757dd8d relnotes/next --- a/relnotes/next Mon Feb 01 12:55:53 2021 -0800 +++ b/relnotes/next Mon Feb 01 17:13:24 2021 -0500 @@ -8,6 +8,11 @@ == 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. + == Bug Fixes ==