HomePhabricator

context: implement mergestate() method

Authored by durin42.

Description

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

Details

Committed
durin42May 18 2020, 4:00 PM
Differential Revision
D8551: context: implement mergestate() method
Parents
rHGb7808443ed6a: mergestate: split out merge state handling code from main merge module
Branches
Unknown
Tags
Unknown