Mercurial > hg
changeset 38965:cf68e2649e0a
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 | 05ded838c997 |
| children | 5b04b6204931 |
| files | mercurial/cmdutil.py tests/test-conflict.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Thu Aug 09 12:20:28 2018 +0300 +++ b/mercurial/cmdutil.py Thu Aug 09 12:32:11 2018 +0300 @@ -617,7 +617,7 @@ def _mergemsg(): # tweakdefaults requires `update` to have a rev hence the `.` - return _helpmessage('hg commit', _updatecleanmsg()) + return _helpmessage('hg commit', 'hg merge --abort') def _bisectmsg(): msg = _('To mark the changeset good: hg bisect --good\n'
--- a/tests/test-conflict.t Thu Aug 09 12:20:28 2018 +0300 +++ b/tests/test-conflict.t Thu Aug 09 12:32:11 2018 +0300 @@ -58,7 +58,7 @@ # To mark files as resolved: hg resolve --mark FILE # To continue: hg commit - # To abort: hg update --clean . (warning: this will discard uncommitted changes) + # To abort: hg merge --abort $ cat a