diff -r b62000a28812 -r 1c93e0237a24 tests/test-context.py
--- a/tests/test-context.py	Fri Jul 06 21:41:36 2018 +0900
+++ b/tests/test-context.py	Fri Jul 06 21:49:25 2018 +0900
@@ -5,12 +5,12 @@
 from mercurial.node import hex
 from mercurial import (
     context,
+    diffutil,
     encoding,
     hg,
     scmutil,
     ui as uimod,
 )
-from mercurial.utils import diffutil
 
 print_ = print
 def print(*args, **kwargs):