changeset 33689 | 9c27a2891b75 |
parent 33688 | 2194a8723138 |
child 33693 | db3dc11356ed |
--- a/mercurial/commands.py Tue Aug 01 17:58:20 2017 +0200 +++ b/mercurial/commands.py Tue Aug 01 18:07:34 2017 +0200 @@ -4943,7 +4943,7 @@ troublemsg = { "unstable": _("orphan: %d changesets"), "divergent": _("content-divergent: %d changesets"), - "bumped": _("bumped: %d changesets"), + "bumped": _("phase-divergent: %d changesets"), } if numtrouble > 0: ui.status(troublemsg[trouble] % numtrouble + "\n")