Mercurial > hg

view tests/failfilemerge.py @ 48980:6e7ae547e38d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullbundle: fix file name in the help text It is pullbundles.manifest and not pullbundle.manifest. Differential Revision: https://phab.mercurial-scm.org/D12391
author Joerg Sonnenberger <joerg@bec.de>
date Tue, 22 Mar 2022 03:19:01 +0100
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)