Mercurial > public > mercurial-scm > python-hglib
view hglib/merge.py @ 185:8e959ad6a25c
Added tag 2.4 for changeset 820d7c1e470a
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 03 Apr 2017 16:02:08 -0500 |
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'