Mercurial > hg
view tests/failfilemerge.py @ 50334:2231f7d8a602 stable
test-tx-rollback: more lenient glob for kill status (issue6807)
The "killed" message may have some prefix and/or suffix which differ
depending on the platform.
This makes the pinned test output more lenient to accept those.
author | pacien <pacien.trangirard@pacien.net> |
---|---|
date | Wed, 05 Apr 2023 11:58:25 +0200 |
parents | 6000f5b25c9b |
children |
line wrap: on
line source
# extension to emulate interrupting filemerge._filemerge from mercurial import ( error, extensions, filemerge, ) def failfilemerge(*args, **kwargs): raise error.Abort(b"^C") def extsetup(ui): extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)