Mercurial > public > mercurial-scm > python-hglib
diff hglib/__init__.py @ 46:ebcc5d7dd528
client: introduce merge handlers
These can control the behaviour when Mercurial prompts what to do with regard
to a specific file
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Tue, 16 Aug 2011 23:58:24 +0300 |
parents | 5fa34c3ac9a0 |
children | f4cc7ff53cf8 |