Mercurial > hg

view mercurial/__init__.py @ 18036:8b846dbc57b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: support calculating merge actions against non-working contexts This is not currently used. It is instead a pre-requisite to performing non-conflicting grafts in memory, which a subsequent patch will do.
author David Schleimer <dschleimer@fb.com>
date Tue, 04 Dec 2012 12:54:18 -0800
parents 9117c6561b0b
children 4374d819ccd5
line wrap: on
line source