author | Sean Farley <sean@farley.io> |
Fri, 28 Jul 2017 16:36:36 -0700 | |
branch | stable |
changeset 33635 | f9134e96ed0f |
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)