mercurial/mdiff.py

--- a/mercurial/mdiff.py	Sat Aug 13 12:15:49 2016 +0900
+++ b/mercurial/mdiff.py	Sat Aug 13 12:18:58 2016 +0900
@@ -14,13 +14,13 @@
 from .i18n import _
 from . import (
     error,
-    mpatch,
     policy,
     pycompat,
     util,
 )
 
 bdiff = policy.importmod(r'bdiff')
+mpatch = policy.importmod(r'mpatch')
 
 blocks = bdiff.blocks
 fixws = bdiff.fixws