Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 41374:d75fde22de91
cmdutil: drop obsolete comment about updating to '.'
Obsolete since cf68e2649e0a (status: advertise --abort instead of
'update -C .' to abort a merge, 2018-08-09) and 5b04b6204931 (status:
advertise --abort instead of 'update -C .' to abort graft, 2018-08-09).
Differential Revision: https://phab.mercurial-scm.org/D5694
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 25 Jan 2019 09:50:23 -0800 |
| parents | 876494fd967d |
| children | d783c937aa53 |
comparison
equal
deleted
inserted
replaced
| 41373:b5f5dc0fa908 | 41374:d75fde22de91 |
|---|---|
| 605 | 605 |
| 606 def _unshelvemsg(): | 606 def _unshelvemsg(): |
| 607 return _helpmessage('hg unshelve --continue', 'hg unshelve --abort') | 607 return _helpmessage('hg unshelve --continue', 'hg unshelve --abort') |
| 608 | 608 |
| 609 def _graftmsg(): | 609 def _graftmsg(): |
| 610 # tweakdefaults requires `update` to have a rev hence the `.` | |
| 611 return _helpmessage('hg graft --continue', 'hg graft --abort') | 610 return _helpmessage('hg graft --continue', 'hg graft --abort') |
| 612 | 611 |
| 613 def _mergemsg(): | 612 def _mergemsg(): |
| 614 # tweakdefaults requires `update` to have a rev hence the `.` | |
| 615 return _helpmessage('hg commit', 'hg merge --abort') | 613 return _helpmessage('hg commit', 'hg merge --abort') |
| 616 | 614 |
| 617 def _bisectmsg(): | 615 def _bisectmsg(): |
| 618 msg = _('To mark the changeset good: hg bisect --good\n' | 616 msg = _('To mark the changeset good: hg bisect --good\n' |
| 619 'To mark the changeset bad: hg bisect --bad\n' | 617 'To mark the changeset bad: hg bisect --bad\n' |