comparison setup.py @ 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 fd3b94f1712d
children 4c53c12b92d5
comparison
equal deleted inserted replaced
44856:b7808443ed6a 44857:e607099d8b93