Skip to content
Snippets Groups Projects
user avatar
Phil Cohen authored
With in-memory merge, copy information needs to be stored in-memory, not in the
dirstate.

To make this transition easy, move the existing dirstate-based approach to
workingfilectx; that way, other implementations can choose to store it
somewhere else.

Differential Revision: https://phab.mercurial-scm.org/D1106
754b5117
History
Name Last commit Last update