tests/failfilemerge.py

--- a/tests/failfilemerge.py	Sat Oct 05 10:29:34 2019 -0400
+++ b/tests/failfilemerge.py	Sun Oct 06 09:45:02 2019 -0400
@@ -8,12 +8,13 @@
     filemerge,
 )
 
-def failfilemerge(filemergefn,
-                  premerge, repo, wctx, mynode, orig, fcd, fco, fca,
-                  labels=None):
+
+def failfilemerge(
+    filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
+):
     raise error.Abort("^C")
     return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)
 
+
 def extsetup(ui):
-    extensions.wrapfunction(filemerge, '_filemerge',
-                            failfilemerge)
+    extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)