tests/test-resolve.t

--- a/tests/test-resolve.t	Tue Feb 27 00:33:46 2018 +0530
+++ b/tests/test-resolve.t	Sat Mar 03 09:35:59 2018 -0500
@@ -85,7 +85,12 @@
 
   $ cat > $TESTTMP/markdriver.py << EOF
   > '''mark and unmark files as driver-resolved'''
-  > from mercurial import merge, registrar, scmutil, pycompat
+  > from mercurial import (
+  >    merge,
+  >    pycompat,
+  >    registrar,
+  >    scmutil,
+  > )
   > cmdtable = {}
   > command = registrar.command(cmdtable)
   > @command(b'markdriver',