D9944: relnotes: add entry for `hg diff --merge -c`
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Mon Feb 1 22:13:49 UTC 2021
durin42 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D9944
AFFECTED FILES
relnotes/next
CHANGE DETAILS
diff --git a/relnotes/next b/relnotes/next
--- a/relnotes/next
+++ b/relnotes/next
@@ -5,6 +5,10 @@
* The `rev-branch-cache` is now updated incrementally whenever changesets
are added.
+ * `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.
== New Experimental Features ==
To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list