comparison tests/test-bdiff.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 0c73634d0570
children e05d7c71f209
comparison
equal deleted inserted replaced
34301:3704d3f21136 34302:440ece43024c