view hglib/merge.py @ 104:6e423f7c784f

ancestor: fix incorrect reference to 'n2'
author Francisco Figueirido <francisco@giantclam.net>
date Thu, 01 Mar 2012 23:16:07 -0500
parents ebcc5d7dd528
children fe74d5599539
line wrap: on
line source

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 ''

    """
    This corresponds to Mercurial's -y/--noninteractive global option, which
    picks the first choice on all prompts.
    """
    noninteractive = 'yes'