mercurial/simplemerge.py

33932:3b2a002ef685

        if not opts.get('text'):
            raise error.Abort(msg)
    return text

def _picklabels(defaults, overrides):
    name_a, name_b, name_base = defaults

    if len(overrides) > 0:
        name_a = overrides[0]
    if len(overrides) > 1:
        name_b = overrides[1]
    if len(overrides) > 2:
        name_base = overrides[2]
    if len(overrides) > 3:
        raise error.Abort(_("can only specify three labels."))

    return [name_a, name_b, name_base]

def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
    """Performs the simplemerge algorithm.

    The merged result is written into `localctx`.

33933:39d253d088a9

        if not opts.get('text'):
            raise error.Abort(msg)
    return text

def _picklabels(defaults, overrides):
    if len(overrides) > 3:
        raise error.Abort(_("can only specify three labels."))
    result = defaults[:]
    for i, override in enumerate(overrides):
        result[i] = override
    return result

def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
    """Performs the simplemerge algorithm.

    The merged result is written into `localctx`.