##// END OF EJS Templates
Added signature for changeset dcec16e799dd
Added signature for changeset dcec16e799dd

File last commit:

r49261:f45a4a47 default
r49648:b84ff512 stable
Show More
failfilemerge.py
20 lines | 463 B | text/x-python | PythonLexer
# extension to emulate interrupting filemerge._filemerge
from __future__ import absolute_import
from mercurial import (
error,
extensions,
filemerge,
)
def failfilemerge(
filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
):
raise error.Abort(b"^C")
return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)
def extsetup(ui):
extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)