diff tests/test-merge-force.t @ 43084:62bb49a1d05d

context: default to using branch from dirstate only in workingctx Same reasoning as previous commits: only the workingctx should know about the dirstate. committablectx now seems free of dirstate references. Differential Revision: https://phab.mercurial-scm.org/D6374
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 10 May 2019 22:24:47 -0700
parents 5abc47d4ca6b
children 4764e8436b2a
line wrap: on
line diff