Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/cmdutil.py
branchstable
changeset 46687 83ffc49f7e48
parent 46475 f0982c76ef1b
child 46794 e2f7b2695ba1 
--- 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