author | Yuya Nishihara <yuya@tcha.org> |
Sat, 12 Sep 2020 21:45:37 +0900 | |
changeset 45568 | 9a26fea2b518 |
parent 43076 | 2372284d9457 |
child 45681 | a736ab681b78 |
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("^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) def extsetup(ui): extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)