Branch name printed since
a3d73b3e1f8a now in local encoding.
Make test-branchmap executable and adjust output after
a3d73b3e1f8a
help: add "hg help config" topic
This is a condensed version of the first two sections of hgrc.5.txt.
After a slight upgrade of minirst, we can move the whole of hgrc.5.txt
into the config help topic and just let the man page include it.
hgrc.5: do not mention "name: value" syntax
This was supported in versions prior to 1.3 where we used the standard
Python ConfigParser. The new config parser never supported it.
submerge: properly deal with overwrites
also pull .hgsubstate check out of inner loop