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