Mercurial > public > mercurial-scm > hg

diff mercurial/cmdutil.py @ 46794:e2f7b2695ba1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 18 Mar 2021 18:24:59 -0400
parents 62c2857a174b 83ffc49f7e48
children d4ba4d51f85f
line wrap: on
line diff
--- 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