diff -r defabf63e969 -r 8ff1ecfadcd1 mercurial/mergeutil.py
--- a/mercurial/mergeutil.py	Tue Oct 08 15:15:37 2019 -0700
+++ b/mercurial/mergeutil.py	Tue Oct 08 15:06:18 2019 -0700
@@ -15,7 +15,7 @@
 def checkunresolved(ms):
     if list(ms.unresolved()):
         raise error.Abort(
-            _(b"unresolved merge conflicts " b"(see 'hg help resolve')")
+            _(b"unresolved merge conflicts (see 'hg help resolve')")
         )
     if ms.mdstate() != b's' or list(ms.driverresolved()):
         raise error.Abort(