tests/test-simplemerge.py.out

help: show extension commands in short list, separate extension list in help

In 'hg', we now show a short list of commands, including extension commands.
In 'hg help', we show core commands, a list of enabled extensions, and topics.

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK