diff -r c0aab5961876 -r e9a0d5f5c225 mercurial/merge.py
--- a/mercurial/merge.py	Thu Oct 15 01:15:22 2015 -0700
+++ b/mercurial/merge.py	Thu Oct 15 01:17:29 2015 -0700
@@ -516,6 +516,18 @@
         unfoldprefix = f + '/'
         lastfull = f
 
+def driverpreprocess(repo, ms, wctx, labels=None):
+    """run the preprocess step of the merge driver, if any
+
+    This is currently not implemented -- it's an extension point."""
+    return True
+
+def driverconclude(repo, ms, wctx, labels=None):
+    """run the conclude step of the merge driver, if any
+
+    This is currently not implemented -- it's an extension point."""
+    return True
+
 def manifestmerge(repo, wctx, p2, pa, branchmerge, force, partial,
                   acceptremote, followcopies):
     """