Mercurial > hg

comparison relnotes/next @ 46498: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
comparison
equal deleted inserted replaced
46497:4a012e531066 46498:3caa3698335e
9 == New Experimental Features == 9 == New Experimental Features ==
10 10
11 * There's a new `diff.merge` config option to show the changes 11 * There's a new `diff.merge` config option to show the changes
12 relative to an automerge for merge changesets. This makes it 12 relative to an automerge for merge changesets. This makes it
13 easier to detect and review manual changes performed in merge 13 easier to detect and review manual changes performed in merge
14 changesets. It is only supported by `hg diff --change` so far. 14 changesets. It is supported by `hg diff --change`, `hg log -p`
15 `hg incoming -p`, and `hg outgoing -p` so far.
15 16
16 17
17 == Bug Fixes == 18 == Bug Fixes ==
18 19
19 20