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

mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -m test -d "1000000 0"
hg history
hg manifest --debug
hg cat a
hg verify