Mercurial > public > mercurial-scm > hg

comparison tests/failfilemerge.py @ 48432:f45a4a47f6a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: inline `_filemerge()` into `filemerge()` The caller is now trivial, so the indirection is pointless. Differential Revision: https://phab.mercurial-scm.org/D11860
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 03 Dec 2021 22:45:35 -0800
parents de8181c5414d
children 6000f5b25c9b
comparison
equal deleted inserted replaced
48431:6b1049d71c3e 48432:f45a4a47f6a8
12 def failfilemerge(*args, **kwargs): 12 def failfilemerge(*args, **kwargs):
13 raise error.Abort(b"^C") 13 raise error.Abort(b"^C")
14 14
15 15
16 def extsetup(ui): 16 def extsetup(ui):
17 extensions.wrapfunction(filemerge, '_filemerge', failfilemerge) 17 extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)