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

echo '[Section]' >> $HGRCPATH
echo 'KeY = Case Sensitive' >> $HGRCPATH
echo 'key = lower case' >> $HGRCPATH

hg showconfig