view tests/failfilemerge.py @ 48590:7e503eff3c76

update: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12022
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Jan 2022 13:23:49 -0800
parents f45a4a47f6a8
children 6000f5b25c9b
line wrap: on
line source

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)


def failfilemerge(*args, **kwargs):
    raise error.Abort(b"^C")


def extsetup(ui):
    extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)