Mercurial > hg-stable

changeset 46519:6b847757dd8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
relnotes: add entry for `hg diff --merge -c` Differential Revision: https://phab.mercurial-scm.org/D9944
author Augie Fackler <augie@google.com>
date Mon, 01 Feb 2021 17:13:24 -0500
parents 1c66795862cf
children 5be886200eb6
files relnotes/next
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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 ==