Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 46394:83ffc49f7e48 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
morestatus: convert a UI message about merge conflicts to bytes Differential Revision: https://phab.mercurial-scm.org/D10172
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 11 Mar 2021 17:14:30 -0500
parents f0982c76ef1b
children e2f7b2695ba1
line wrap: on
line diff
--- 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