hgext/largefiles/overrides.py
changeset 48432 f45a4a47f6a8
parent 48431 6b1049d71c3e
child 48506 608a35db186c
--- a/hgext/largefiles/overrides.py	Fri Dec 03 21:41:43 2021 -0800
+++ b/hgext/largefiles/overrides.py	Fri Dec 03 22:45:35 2021 -0800
@@ -666,7 +666,7 @@
 
 # Override filemerge to prompt the user about how they wish to merge
 # largefiles. This will handle identical edits without prompting the user.
-@eh.wrapfunction(filemerge, b'_filemerge')
+@eh.wrapfunction(filemerge, b'filemerge')
 def overridefilemerge(
     origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
 ):