mercurial/hg.py

44396:acbfa31cfaf2

    return ret


def merge(
    repo, node, force=None, remind=True, mergeforce=False, labels=None,
):
    """Branch merge with node, resolving changes. Return true if any
    unresolved conflicts."""
    stats = mergemod.update(
        repo,

44397:0f60687b2324

    return ret


def merge(
    repo, node, force=False, remind=True, mergeforce=False, labels=None,
):
    """Branch merge with node, resolving changes. Return true if any
    unresolved conflicts."""
    stats = mergemod.update(
        repo,