Mercurial > hg
view relnotes/next @ 44857:e607099d8b93
context: implement mergestate() method
This will let us have the mergestate storage be controlled by the context. In
particular, for working contexts we should use the existing mergestate, but
for overlay contexts it's inappropriate to drop files in .hg/merge.
Differential Revision: https://phab.mercurial-scm.org/D8551
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 18 May 2020 16:00:26 -0400 |
parents | b7808443ed6a |
children | 61cdc8137d53 |
line wrap: on
line source
== New Features == == New Experimental Features == == Backwards Compatibility Changes == == Internal API Changes == * logcmdutil.diffordiffstat() now takes contexts instead of nodes. * The `mergestate` class along with some related methods and constants have moved from `mercurial.merge` to a new `mercurial.mergestate` module.