Mercurial > public > mercurial-scm > hg-stable

diff mercurial/mdiff.py @ 32408:3b88a7fa97d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bdiff: switch to policy importer # no-check-commit
author Yuya Nishihara <yuya@tcha.org>
date Sat, 13 Aug 2016 12:12:50 +0900
parents ded48ad55146
children 151cc3b3d799
line wrap: on
line diff
--- a/mercurial/mdiff.py	Sat Aug 13 12:08:23 2016 +0900
+++ b/mercurial/mdiff.py	Sat Aug 13 12:12:50 2016 +0900
@@ -13,13 +13,15 @@
 
 from .i18n import _
 from . import (
-    bdiff,
     error,
     mpatch,
+    policy,
     pycompat,
     util,
 )
 
+bdiff = policy.importmod(r'bdiff')
+
 blocks = bdiff.blocks
 fixws = bdiff.fixws
 patches = mpatch.patches