author | Martin von Zweigbergk <martinvonz@google.com> |
Tue, 16 May 2017 17:47:27 -0700 | |
changeset 32341 | 8a87bfc5bebb |
parent 30342 | 318a24b52eeb |
child 34137 | c0ce60459d84 |
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, 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)