##// END OF EJS Templates
tests: test-addremove-similar.t use print() for py3
tests: test-addremove-similar.t use print() for py3

File last commit:

r28772:424c1632 default
r29174:478e2b85 default
Show More
failfilemerge.py
18 lines | 483 B | text/x-python | PythonLexer
timeless
rebase: update working directory when aborting (issue5084)
r27988 # extension to emulate interupting filemerge._filemerge
from __future__ import absolute_import
from mercurial import (
Yuya Nishihara
tests: sort import lines in failfilemerge.py
r28772 error,
timeless
rebase: update working directory when aborting (issue5084)
r27988 extensions,
Yuya Nishihara
tests: sort import lines in failfilemerge.py
r28772 filemerge,
timeless
rebase: update working directory when aborting (issue5084)
r27988 )
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)