# HG changeset patch # User Martin von Zweigbergk # Date 1503597613 25200 # Node ID 2a228fb6c23e586d13c0316aaad547f95998ce45 # Parent 4b934144ed1199bc99ae952c3e3890deb9fbab29 evolve: undo change from "divergent" to "phasedivergent" for --divergent Looks like an accidental update in feaa52680682 (log: bumped was renamed into phasedivergent, 2017-08-10). diff -r 4b934144ed11 -r 2a228fb6c23e hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Thu Aug 24 10:57:32 2017 -0700 +++ b/hgext3rd/evolve/__init__.py Thu Aug 24 11:00:13 2017 -0700 @@ -1384,7 +1384,7 @@ ('r', 'rev', [], _('solves troubles of these revisions')), ('', 'bumped', False, _('solves only bumped changesets')), ('', 'phasedivergent', False, _('solves only phase-divergent changesets')), - ('', 'divergent', False, _('solves only phasedivergent changesets')), + ('', 'divergent', False, _('solves only divergent changesets')), ('', 'contentdivergent', False, _('solves only content-divergent changesets')), ('', 'unstable', False, _('solves only unstable changesets')), ('', 'orphan', False, _('solves only orphan changesets (default)')),