D10172: morestatus: convert a UI message about merge conflicts to bytes
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Fri Mar 12 18:09:32 UTC 2021
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
stable
REVISION DETAIL
https://phab.mercurial-scm.org/D10172
AFFECTED FILES
mercurial/cmdutil.py
CHANGE DETAILS
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -869,7 +869,7 @@
)
msg = (
_(
- '''Unresolved merge conflicts:
+ b'''Unresolved merge conflicts:
%s
To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list