Patchwork D9944: relnotes: add entry for `hg diff --merge -c`

login
register
mail settings
Submitter phabricator
Date Feb. 1, 2021, 10:13 p.m.
Message ID <differential-rev-PHID-DREV-7rsjinlf2vjxtdsamix3-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48255/
State Superseded
Headers show

Comments

phabricator - Feb. 1, 2021, 10:13 p.m.
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




To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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 ==