Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
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 stable
authorMatt Harbison <matt_harbison@yahoo.com>
Thu, 11 Mar 2021 17:14:30 -0500
branchstable
changeset 46687 83ffc49f7e48
parent 46686 26d1ddc3f398
child 46688 7e02e7c721b0
morestatus: convert a UI message about merge conflicts to bytes Differential Revision: https://phab.mercurial-scm.org/D10172
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- 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
mercurial