Mercurial > public > mercurial-scm > hg-stable

diff mercurial/help.py @ 42466:9d31581cc44e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/help.py	Wed Jun 12 17:22:37 2019 +0100
+++ b/mercurial/help.py	Thu Jun 13 23:28:31 2019 +0300
@@ -320,6 +320,8 @@
      loaddoc('config', subdir='internals')),
     (['extensions', 'extension'], _('Extension API'),
      loaddoc('extensions', subdir='internals')),
+    (['mergestate'], _('Mergestate'),
+     loaddoc('mergestate', subdir='internals')),
     (['requirements'], _('Repository Requirements'),
      loaddoc('requirements', subdir='internals')),
     (['revlogs'], _('Revision Logs'),