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