author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
Mon, 01 Jun 2020 11:12:25 -0400 | |
changeset 44931 | f294b4e14fd0 |
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)