author | Yuya Nishihara <yuya@tcha.org> |
Tue, 05 Apr 2016 23:21:17 +0900 | |
changeset 28808 | 10c2ce44c35d |
parent 28772 | 424c1632fffb |
child 29774 | a7f8939641aa |
permissions | -rw-r--r-- |
# extension to emulate interupting 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)