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
from __future__ import absolute_importimport pkgutil__path__ = pkgutil.extend_path(__path__, __name__)