author | Robert Stanca <robert.stanca7@gmail.com> |
Sat, 02 Apr 2016 18:12:33 +0300 | |
changeset 28726 | f4b31fcd5e72 |
parent 27988 | 61f4d59e9a0b |
child 28772 | 424c1632fffb |
permissions | -rw-r--r-- |
# extension to emulate interupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( filemerge, extensions, error, ) 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)