diff -r a3fcc8e3136b -r ef21a2c41629 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Fri Oct 09 01:19:37 2015 +0200
+++ b/mercurial/filemerge.py	Sun Oct 11 12:31:08 2015 -0700
@@ -435,7 +435,7 @@
         newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad))
     return newlabels
 
-def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
+def _filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
     """perform a 3-way merge in the working directory
 
     mynode = parent node before merge
@@ -567,5 +567,8 @@
 
     return r
 
+def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
+    return _filemerge(repo, mynode, orig, fcd, fco, fca, labels=labels)
+
 # tell hggettext to extract docstrings from these functions:
 i18nfunctions = internals.values()