##// END OF EJS Templates
test-fileset: eliminate a duplicate test that was conditionalized for output
test-fileset: eliminate a duplicate test that was conditionalized for output

File last commit:

r30332:318a24b5 default
r31853:67ea8e85 default
Show More
failfilemerge.py
18 lines | 494 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, 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)