Submitter | phabricator |
---|---|
Date | March 12, 2021, 6:09 p.m. |
Message ID | <differential-rev-PHID-DREV-qhpkxcj7k5lote2qslvy-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/48488/ |
State | Superseded |
Headers | show |
Comments
Patch
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