Mercurial > hg
view tests/test-gendoc-it.t @ 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 | 7a1ad08b9ff5 |
children |
line wrap: on
line source
#require docutils gettext $ $TESTDIR/check-gendoc it checking for parse errors