upstream/mercurial-mirror Files · relnotes/next

log: respect diff.merge in -p output...

log: respect diff.merge in -p output Differential Revision: https://phab.mercurial-scm.org/D9958

Martin von Zweigbergk - - Load All Authors

File last commit:

r47226:a788e4bb default


                r47226:a788e4bb

default

Download file

             next
        
                    28 lines
            
             | 741 B
            
                | text/plain
            
             |
                TextLexer

/ relnotes / next

History | Source | Raw |Copy content |Copy permalink

Martin von Zweigbergk releasenotes: add a file in which to record release notes...	r42457	== New Features ==
Martin von Zweigbergk branching: merge with stable	r47182
Valentin Gatien-Baron purge: move extension into core mercurial...	r47080	* `hg purge` is now a core command using `--confirm` by default.
Martin von Zweigbergk branching: merge with stable	r47182
Joerg Sonnenberger branchmap: update rev-branch-cache incrementally...	r47084	* The `rev-branch-cache` is now updated incrementally whenever changesets
		are added.
Martin von Zweigbergk releasenotes: add a file in which to record release notes...	r42457
Joerg Sonnenberger branchmap: avoid ancestor computations in absence of non-continous branches...	r46880
Martin von Zweigbergk copy: add experimental support for marking committed copies...	r44847	== New Experimental Features ==
Martin von Zweigbergk revset: add a revset for parents in merge state...	r44817
Martin von Zweigbergk diff: replace --merge option by config option...	r47224	* 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
Martin von Zweigbergk log: respect diff.merge in -p output...	r47226	changesets. It is supported by `hg diff --change`, `hg log -p`
		`hg incoming -p`, and `hg outgoing -p` so far.
Augie Fackler relnotes: add entry for `hg diff --merge -c`...	r47183
Manuel Jacob relnotes: add release notes for relevant changes I did since the 5.4 release...	r45764
		== Bug Fixes ==


Manuel Jacob relnotes: make spacing before new section consistent...	r45762
Martin von Zweigbergk releasenotes: add a file in which to record release notes...	r42457	== Backwards Compatibility Changes ==

Martin von Zweigbergk debugmergestate: make templated...	r44880
Martin von Zweigbergk releasenotes: add a file in which to record release notes...	r42457	== Internal API Changes ==

Joerg Sonnenberger changelog: move branchinfo to changelogrevision...	r47082	* `changelog.branchinfo` is deprecated and will be removed after 5.8.
		It is superseded by `changelogrevision.branchinfo`.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages