Page MenuHomePhabricator

help: add help entry for internals.mergestate
ClosedPublic

Authored by navaneeth.suresh on May 27 2019, 9:24 AM.

Details

Summary

This patch adds an entry for internals.mergestate as suggested
by @marmoute. Most of the help text is taken from merge.mergestate.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.

This needs some fixups to keep test-help.t and the Windows installer happy:

https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/1468/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio

See 876f08f30ade for an example of how to fix the installer.

This needs some fixups to keep test-help.t and the Windows installer happy:
https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/1468/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio
See 876f08f30ade for an example of how to fix the installer.

Thanks! Doing that right away!