various doc fixes - update can no longer be used to merge - short summary start with lowercase - add merge to short help list - fix tests

#!/bin/sh

hg init
hg log
hg grep wah
hg manifest
hg verify