--- a/contrib/synthrepo.py	Fri Jul 06 21:41:36 2018 +0900
+++ b/contrib/synthrepo.py	Fri Jul 06 21:49:25 2018 +0900
@@ -54,6 +54,7 @@
 )
 from mercurial import (
     context,
+    diffutil,
     error,
     hg,
     patch,
@@ -62,7 +63,6 @@
 )
 from mercurial.utils import (
     dateutil,
-    diffutil,
 )
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for