Mercurial > public > mercurial-scm > hg-stable
diff mercurial/state.py @ 45248:a253ded5b03d
morestatus: mention --stop even if not using --verbose
Differential Revision: https://phab.mercurial-scm.org/D8811
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Thu, 23 Jul 2020 13:31:45 -0700 |
| parents | 5322e738be0f |
| children | d4a28b76fa54 |
line wrap: on
line diff
--- a/mercurial/state.py Fri Jul 24 11:24:59 2020 -0700 +++ b/mercurial/state.py Thu Jul 23 13:31:45 2020 -0700 @@ -164,10 +164,19 @@ operation """ if not self._cmdhint: - return _(b"use 'hg %s --continue' or 'hg %s --abort'") % ( - self._opname, - self._opname, - ) + if not self._stopflag: + return _(b"use 'hg %s --continue' or 'hg %s --abort'") % ( + self._opname, + self._opname, + ) + else: + return _(b"use 'hg %s --continue', 'hg %s --abort', " + b"or 'hg %s --stop'") % ( + self._opname, + self._opname, + self._opname, + ) + return self._cmdhint def msg(self):