Mercurial > hg

diff mercurial/mdiff.py @ 32371:151cc3b3d799

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mpatch: switch to policy importer
author Yuya Nishihara <yuya@tcha.org>
date Sat, 13 Aug 2016 12:18:58 +0900
parents 3b88a7fa97d8
children 1b6946f87c50
line wrap: on
line diff
--- 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