diff tests/fakemergerecord.py @ 34302:440ece43024c

merge: allow a custom working context to be passed to update This will allow anyone to enable the first in-menmory merge milestone by wrapping merge.update in an extension and creating an overlayworkingctx. Differential Revision: https://phab.mercurial-scm.org/D682
author Phil Cohen <phillco@fb.com>
date Thu, 14 Sep 2017 13:14:32 -0700
parents 46ba2cdda476
children 8173eeb69fb3
line wrap: on
line diff