tests/failfilemerge.py
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 11 Jan 2022 21:56:27 -0800
changeset 48562 12ac4401ff7d
parent 48432 f45a4a47f6a8
child 48875 6000f5b25c9b
permissions -rw-r--r--
simplemerge: simplify and rename `render_markers()` `render_markers()` now always renders minimized 2-way markers, so let's simplify and rename it accordingly. Differential Revision: https://phab.mercurial-scm.org/D11979

# 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)