--- a/tests/failfilemerge.py	Sun Apr 03 19:40:05 2016 +0900
+++ b/tests/failfilemerge.py	Sun Apr 03 19:41:00 2016 +0900
@@ -3,9 +3,9 @@
 from __future__ import absolute_import
 
 from mercurial import (
-    filemerge,
+    error,
     extensions,
-    error,
+    filemerge,
 )
 
 def failfilemerge(filemergefn,