diff -r 26d1ddc3f398 -r 83ffc49f7e48 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Thu Mar 11 17:12:08 2021 -0500
+++ b/mercurial/cmdutil.py	Thu Mar 11 17:14:30 2021 -0500
@@ -869,7 +869,7 @@
             )
             msg = (
                 _(
-                    '''Unresolved merge conflicts:
+                    b'''Unresolved merge conflicts:
 
 %s