Mercurial > public > mercurial-scm > hg-stable

diff relnotes/next @ 46550:3caa3698335e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log: respect diff.merge in -p output Differential Revision: https://phab.mercurial-scm.org/D9958
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 04 Feb 2021 13:32:11 -0800
parents d57e607d9e33
children 0a23ace80e54
line wrap: on
line diff
--- a/relnotes/next	Thu Feb 04 13:21:01 2021 -0800
+++ b/relnotes/next	Thu Feb 04 13:32:11 2021 -0800
@@ -11,7 +11,8 @@
  * 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.
+    changesets. It is supported by `hg diff --change`, `hg log -p`
+    `hg incoming -p`, and `hg outgoing -p` so far.
 
 
 == Bug Fixes ==