# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2021-03-11 22:14:30
# Node ID 83ffc49f7e48c2d4e5217aca932b39208269c0bd
# Parent  26d1ddc3f3987636fa3f3ba4508c17e7822485b9

morestatus: convert a UI message about merge conflicts to bytes

Differential Revision: https://phab.mercurial-scm.org/D10172

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -869,7 +869,7 @@ class morestatus(object):
             )
             msg = (
                 _(
-                    '''Unresolved merge conflicts:
+                    b'''Unresolved merge conflicts:
 
 %s