##// END OF EJS Templates
branching: merge default into stable for 6.1 freeze
branching: merge default into stable for 6.1 freeze

File last commit:

r49261:f45a4a47 default
r49650:c00d3ce4 merge 6.1rc0 stable
Show More
failfilemerge.py
17 lines | 320 B | text/x-python | PythonLexer
# 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)