diff -r b62000a28812 -r 1c93e0237a24 mercurial/obsutil.py
--- a/mercurial/obsutil.py	Fri Jul 06 21:41:36 2018 +0900
+++ b/mercurial/obsutil.py	Fri Jul 06 21:49:25 2018 +0900
@@ -11,13 +11,13 @@
 
 from .i18n import _
 from . import (
+    diffutil,
     node as nodemod,
     phases,
     util,
 )
 from .utils import (
     dateutil,
-    diffutil,
 )
 
 ### obsolescence marker flag