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 a
cd a
hg -v log -v
hg -v log -v x
true