relnotes/next
changeset 46496 d57e607d9e33
parent 46454 6b847757dd8d
child 46498 3caa3698335e
--- 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 ==