author | Yuya Nishihara <yuya@tcha.org> |
Wed, 09 Sep 2020 16:04:39 +0900 | |
changeset 45699 | 888e633f0c1c |
parent 45681 | a736ab681b78 |
child 48471 | de8181c5414d |
permissions | -rw-r--r-- |
# 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(b"^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) def extsetup(ui): extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)