# HG changeset patch # User Martin von Zweigbergk # Date 1526013448 25200 # Node ID 648552969e88374dba13871d3a772af5947d3764 # Parent 422294cd682fb3c936ea534f2d3f9c31db367c07 evolve: point to '--abort' in verbose status message f6979d64b9fb (evolve: point to '--abort' in error message, 2018-04-22) changed "hg update -C ." to "hg evolve --abort" in error messages. This commit makes the same change in the verbose status message (the one that warns about unfinished evolve). There's still one mention "hg update -C" in our codebase. That's after "hg evolve --content-divergent" fails, but I don't think "hg evolve --abort" works in that case (yet?). diff -r 422294cd682f -r 648552969e88 hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Sat Apr 28 18:44:07 2018 +0530 +++ b/hgext3rd/evolve/__init__.py Thu May 10 21:37:28 2018 -0700 @@ -1352,7 +1352,7 @@ @eh.uisetup def setupevolveunfinished(ui): data = ('evolvestate', False, False, _('evolve in progress'), - _("use 'hg evolve --continue' or 'hg update -C .' to abort")) + _("use 'hg evolve --continue' or 'hg evolve --abort' to abort")) cmdutil.unfinishedstates.append(data) afterresolved = ('evolvestate', _('hg evolve --continue'))