Mercurial > hg

diff mercurial/merge.py @ 19701:f0f8380ec516

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commitablefilectx: add a class that will be used for mutable file contexts Just like commitablectx, this will serve as a common place for code that will be shared between workingfilectx and memfilectx.
author Sean Farley <sean.michael.farley@gmail.com>
date Thu, 15 Aug 2013 13:11:51 -0500
parents 499fc471296b
children 76df01e56e7f
line wrap: on
line diff