author | Anton Shestakov <av6@dwimlabs.net> |
Thu, 26 Oct 2017 11:58:55 +0800 | |
branch | stable |
changeset 34927 | c2695cbb5fb1 |
parent 34122 | c0ce60459d84 |
child 43076 | 2372284d9457 |
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)