diff -r 57875cf423c9 -r 2372284d9457 mercurial/mergeutil.py
--- a/mercurial/mergeutil.py	Sat Oct 05 10:29:34 2019 -0400
+++ b/mercurial/mergeutil.py	Sun Oct 06 09:45:02 2019 -0400
@@ -9,14 +9,16 @@
 
 from .i18n import _
 
-from . import (
-    error,
-)
+from . import error
+
 
 def checkunresolved(ms):
     if list(ms.unresolved()):
-        raise error.Abort(_("unresolved merge conflicts "
-                            "(see 'hg help resolve')"))
+        raise error.Abort(
+            _("unresolved merge conflicts " "(see 'hg help resolve')")
+        )
     if ms.mdstate() != 's' or list(ms.driverresolved()):
-        raise error.Abort(_('driver-resolved merge conflicts'),
-                          hint=_('run "hg resolve --all" to resolve'))
+        raise error.Abort(
+            _('driver-resolved merge conflicts'),
+            hint=_('run "hg resolve --all" to resolve'),
+        )