Mercurial > hg
view tests/failfilemerge.py @ 38416:35b50237908b
configitem: reorder items in the 'server' section
Keeping things alphabetically sorted.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 19 Jun 2018 18:21:37 +0200 |
parents | c0ce60459d84 |
children | 2372284d9457 |
line wrap: on
line source
# extension to emulate interrupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( error, extensions, filemerge, ) def failfilemerge(filemergefn, premerge, repo, wctx, 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)