diff -r b62000a28812 -r 1c93e0237a24 mercurial/templatekw.py
--- a/mercurial/templatekw.py	Fri Jul 06 21:41:36 2018 +0900
+++ b/mercurial/templatekw.py	Fri Jul 06 21:49:25 2018 +0900
@@ -14,6 +14,7 @@
 )
 
 from . import (
+    diffutil,
     encoding,
     error,
     hbisect,
@@ -27,7 +28,6 @@
     util,
 )
 from .utils import (
-    diffutil,
     stringutil,
 )