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

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

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

hgext/largefiles/overrides.py

@@ -666,7 +666,7 b' def mergerecordupdates(orig, repo, actio'
 
 # Override filemerge to prompt the user about how they wish to merge
 # largefiles. This will handle identical edits without prompting the user.
[e-mail](filemerge, b'_filemerge')
[e-mail](filemerge, b'filemerge')
 def overridefilemerge(
     origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
 ):

mercurial/filemerge.py

@@ -1027,7 +1027,7 b' def _maketempfiles(repo, fco, fca, local'
                 util.unlink(d)
 
 
-def _filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
+def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
     """perform a 3-way merge in the working directory
 
     premerge = whether this is a premerge
@@ -1277,10 +1277,6 b' def _workingpath(repo, ctx):'
     return repo.wjoin(ctx.path())
 
 
-def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
-    return _filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels)
-
-
 def loadinternalmerge(ui, extname, registrarobj):
     """Load internal merge tool from specified registrarobj"""
     for name, func in pycompat.iteritems(registrarobj._table):

tests/failfilemerge.py

@@ -14,4 +14,4 b' def failfilemerge(*args, **kwargs):'
 
 
 def extsetup(ui):
-    extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)
+    extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)