tests/bundles/darcs1.hg
author Phil Cohen <phillco@fb.com>
Mon, 11 Sep 2017 13:03:27 -0700
changeset 34122 c0ce60459d84
parent 14116 cd3032437064
permissions -rw-r--r--
merge: pass wctx to premerge, filemerge In the in-memory merge branch. we'll need to call a function (``flushall``) on the wctx inside of _xmerge. This prepares the way so it can be done without hacks like ``fcd.ctx()``. Differential Revision: https://phab.mercurial-scm.org/D449

(binary:application/octet-stream)