Mercurial > hg
view tests/test-gendoc-ro.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 | 8346b2f09e79 |
children |
line wrap: on
line source
#require docutils gettext Error: the current ro localization has some rst defects exposed by moving pager to core. These two warnings about references are expected until the localization is corrected. $ $TESTDIR/check-gendoc ro checking for parse errors gendoc.txt:58: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string. gendoc.txt:58: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string.