diff tests/failfilemerge.py @ 48432:f45a4a47f6a8

filemerge: inline `_filemerge()` into `filemerge()`

The caller is now trivial, so the indirection is pointless.

Differential Revision: https://phab.mercurial-scm.org/D11860

--- 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)