Mercurial > public > mercurial-scm > hg
comparison mercurial/help.py @ 42450:9d31581cc44e
help: add help entry for internals.mergestate
This patch adds an entry for `internals.mergestate` as suggested
by @marmoute. Most of the help text is taken from `merge.mergestate`.
Differential Revision: https://phab.mercurial-scm.org/D6448
Differential Revision: https://phab.mercurial-scm.org/D6528
author | Navaneeth Suresh <navaneeths1998@gmail.com> |
---|---|
date | Thu, 13 Jun 2019 23:28:31 +0300 |
parents | ad55a0a5894f |
children | 2372284d9457 |
comparison
equal
deleted
inserted
replaced
42449:c19d259fd6ad | 42450:9d31581cc44e |
---|---|
318 loaddoc('changegroups', subdir='internals')), | 318 loaddoc('changegroups', subdir='internals')), |
319 (['config'], _('Config Registrar'), | 319 (['config'], _('Config Registrar'), |
320 loaddoc('config', subdir='internals')), | 320 loaddoc('config', subdir='internals')), |
321 (['extensions', 'extension'], _('Extension API'), | 321 (['extensions', 'extension'], _('Extension API'), |
322 loaddoc('extensions', subdir='internals')), | 322 loaddoc('extensions', subdir='internals')), |
323 (['mergestate'], _('Mergestate'), | |
324 loaddoc('mergestate', subdir='internals')), | |
323 (['requirements'], _('Repository Requirements'), | 325 (['requirements'], _('Repository Requirements'), |
324 loaddoc('requirements', subdir='internals')), | 326 loaddoc('requirements', subdir='internals')), |
325 (['revlogs'], _('Revision Logs'), | 327 (['revlogs'], _('Revision Logs'), |
326 loaddoc('revlogs', subdir='internals')), | 328 loaddoc('revlogs', subdir='internals')), |
327 (['wireprotocol'], _('Wire Protocol'), | 329 (['wireprotocol'], _('Wire Protocol'), |