Mercurial > hg
view tests/failfilemerge.py @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -0800 |
parents | f45a4a47f6a8 |
children | 6000f5b25c9b |
line wrap: on
line source
# extension to emulate interrupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( error, extensions, filemerge, ) def failfilemerge(*args, **kwargs): raise error.Abort(b"^C") def extsetup(ui): extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)