# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1376598216 18000
# Node ID cc677803bad4c87a6ab5ceace9294024141195f6
# Parent  da67d855a8a2dfb4b0eb9f6470b32e0aa3c91ca6
memfilectx: inherit from committablefilectx

This patch marks the beginning of having memfilectx become a full-fledged file
contex so that we can handle diffing and merging.

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1586,7 +1586,7 @@
         """commit context to the repo"""
         return self._repo.commitctx(self)
 
-class memfilectx(object):
+class memfilectx(committablefilectx):
     """memfilectx represents an in-memory file to commit.
 
     See memctx for more details.