diff tests/test-dirstate.t @ 34037:65ae54582713

merge: move some of the logic in batchget() to workingfilectx We will use this logic in two places with in-memory merge. Differential Revision: https://phab.mercurial-scm.org/D444
author Phil Cohen <phillco@fb.com>
date Thu, 31 Aug 2017 11:28:59 -0700
parents b9765319880e
children 4441705b7111
line wrap: on
line diff