various doc fixes
- update can no longer be used to merge
- short summary start with lowercase
- add merge to short help list
- fix tests
#header#<title>Mercurial Error</title></head><body><h2>Mercurial Error</h2><p>An error occured while processing your request:</p><p>#error|escape#</p>#footer#