Mercurial > hg

diff tests/test-merge5.t @ 34302:440ece43024c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 6b1fc09c699a
children 527ce85c2e60
line wrap: on
line diff