author | Augie Fackler <augie@google.com> |
Sun, 19 Mar 2017 01:03:53 -0400 | |
changeset 31565 | 553ad16b274f |
parent 30332 | 318a24b52eeb |
child 34122 | 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)