##// END OF EJS Templates
py3: make test-bisect.t bytes-safe
py3: make test-bisect.t bytes-safe

File last commit:

r34124:c0ce6045 default
r36847:4eb3bf22 default
Show More
failfilemerge.py
19 lines | 518 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("^C")
return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)
def extsetup(ui):
extensions.wrapfunction(filemerge, '_filemerge',
failfilemerge)