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
changeset 46794 e2f7b2695ba1
parent 46765 62c2857a174b
parent 46687 83ffc49f7e48
child 46819 d4ba4d51f85f 
--- a/mercurial/cmdutil.py	Tue Mar 02 00:05:22 2021 +0100
+++ b/mercurial/cmdutil.py	Thu Mar 18 18:24:59 2021 -0400
@@ -869,7 +869,7 @@
             )
             msg = (
                 _(
-                    '''Unresolved merge conflicts:
+                    b'''Unresolved merge conflicts:
 
 %s
mercurial