Mercurial > hg
view tests/failfilemerge.py @ 48536:8537a64c4e2b stable
Added tag 6.0.1 for changeset 799fdf4cca80
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Wed, 05 Jan 2022 17:53:03 +0100 |
parents | a736ab681b78 |
children | de8181c5414d |
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(b"^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) def extsetup(ui): extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)