##// END OF EJS Templates
merge default into stable for 4.0 code freeze
merge default into stable for 4.0 code freeze

File last commit:

r29774:a7f89396 default
r30215:438173c4 merge 4.0-rc stable
Show More
failfilemerge.py
18 lines | 493 B | text/x-python | PythonLexer
# extension to emulate interupting 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)