Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/failfilemerge.py
changeset 48432 f45a4a47f6a8
parent 48426 de8181c5414d
child 48875 6000f5b25c9b 
--- 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)
mercurial