Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 39003:cf68e2649e0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status: advertise --abort instead of 'update -C .' to abort a merge status has a part where it shows the conflict information and how to continue or abort. Couple of release ago, we got merge --abort and we should advertise that instead of 'hg update -C .' which is kind of ugly. I know we need to unify the logic here. Differential Revision: https://phab.mercurial-scm.org/D4168
author Pulkit Goyal <pulkit@yandex-team.ru>
date Thu, 09 Aug 2018 12:32:11 +0300
parents d99468d2b09a
children 5b04b6204931
comparison
equal deleted inserted replaced
39002:05ded838c997 39003:cf68e2649e0a
615 # tweakdefaults requires `update` to have a rev hence the `.` 615 # tweakdefaults requires `update` to have a rev hence the `.`
616 return _helpmessage('hg graft --continue', _updatecleanmsg()) 616 return _helpmessage('hg graft --continue', _updatecleanmsg())
617 617
618 def _mergemsg(): 618 def _mergemsg():
619 # tweakdefaults requires `update` to have a rev hence the `.` 619 # tweakdefaults requires `update` to have a rev hence the `.`
620 return _helpmessage('hg commit', _updatecleanmsg()) 620 return _helpmessage('hg commit', 'hg merge --abort')
621 621
622 def _bisectmsg(): 622 def _bisectmsg():
623 msg = _('To mark the changeset good: hg bisect --good\n' 623 msg = _('To mark the changeset good: hg bisect --good\n'
624 'To mark the changeset bad: hg bisect --bad\n' 624 'To mark the changeset bad: hg bisect --bad\n'
625 'To abort: hg bisect --reset\n') 625 'To abort: hg bisect --reset\n')