Mercurial Mercurial > hg / 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/mergeutil.py
changeset 43077 687b865b95ad
parent 43076 2372284d9457
child 43117 8ff1ecfadcd1 
--- a/mercurial/mergeutil.py	Sun Oct 06 09:45:02 2019 -0400
+++ b/mercurial/mergeutil.py	Sun Oct 06 09:48:39 2019 -0400
@@ -15,10 +15,10 @@
 def checkunresolved(ms):
     if list(ms.unresolved()):
         raise error.Abort(
-            _("unresolved merge conflicts " "(see 'hg help resolve')")
+            _(b"unresolved merge conflicts " b"(see 'hg help resolve')")
         )
-    if ms.mdstate() != 's' or list(ms.driverresolved()):
+    if ms.mdstate() != b's' or list(ms.driverresolved()):
         raise error.Abort(
-            _('driver-resolved merge conflicts'),
-            hint=_('run "hg resolve --all" to resolve'),
+            _(b'driver-resolved merge conflicts'),
+            hint=_(b'run "hg resolve --all" to resolve'),
         )
Mercurial