comparison mercurial/simplemerge.py @ 34049:6330df9d6393

simplemerge: remove unused `repo` parameter

This is now no longer used or needed thanks to the `decodeddata()` context
function.

Differential Revision: https://phab.mercurial-scm.org/D602

34048:0e0ac8f09048

    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`.
    """
    def readctx(ctx):

34049:6330df9d6393

    result = defaults[:]
    for i, override in enumerate(overrides):
        result[i] = override
    return result

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

    The merged result is written into `localctx`.
    """
    def readctx(ctx):