Mercurial > public > mercurial-scm > hg-stable

diff tests/failfilemerge.py @ 48477: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
line wrap: on
line diff
--- a/tests/failfilemerge.py	Fri Dec 03 21:41:43 2021 -0800
+++ b/tests/failfilemerge.py	Fri Dec 03 22:45:35 2021 -0800
@@ -14,4 +14,4 @@
 
 
 def extsetup(ui):
-    extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)
+    extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)