diff tests/test-merge-prompt.t @ 21665:d2743be1bb06

memctx: inherit from committablectx This patch marks the start of having memctx inherit from committablectx, thereby making it a full-fledged context that will eventually grow the ability to perform diffing and also merging.
author Sean Farley <sean.michael.farley@gmail.com>
date Thu, 15 Aug 2013 15:00:03 -0500
parents c8ba98bf0e71
children 9ab18a912c44
line wrap: on
line diff