Mercurial > hg
view tests/failfilemerge.py @ 46066:e4137c313e7f
run-tests: fix a typo in an attribute name
At least, I assume it's a typo. Nothing else uses it, but `_tmpbindir` is used.
Differential Revision: https://phab.mercurial-scm.org/D9542
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 07 Dec 2020 23:15:35 -0500 |
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)