Mercurial > python-hglib
view hglib/merge.py @ 186:d06b48001662
package: update package url
Replace the package url which was pointing to the repository to the wiki page
instead. This way pypi users will directly see the basic usage and can easily
find the repository url on the wiki page.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 19 Jul 2017 14:48:40 +0200 |
parents | fe74d5599539 |
children |
line wrap: on
line source
from hglib.util import b class handlers(object): """ These can be used as the cb argument to hgclient.merge() to control the behaviour when Mercurial prompts what to do with regard to a specific file, e.g. when one parent modified a file and the other removed it. """ @staticmethod def abort(size, output): """ Abort the merge if a prompt appears. """ return b('') """ This corresponds to Mercurial's -y/--noninteractive global option, which picks the first choice on all prompts. """ noninteractive = 'yes'