Mercurial Mercurial > hg-stable / 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/commands.py
changeset 33714 2194a8723138
parent 33713 6294654453ee
child 33715 9c27a2891b75 
--- a/mercurial/commands.py	Thu Aug 03 00:45:02 2017 +0900
+++ b/mercurial/commands.py	Tue Aug 01 17:58:20 2017 +0200
@@ -4942,7 +4942,7 @@
             # We write all the possibilities to ease translation
             troublemsg = {
                "unstable": _("orphan: %d changesets"),
-               "divergent": _("divergent: %d changesets"),
+               "divergent": _("content-divergent: %d changesets"),
                "bumped": _("bumped: %d changesets"),
             }
             if numtrouble > 0:
hg-stable