abort when using 'update -m' and this is not a merge add more testcases for updating with local changes

#!/bin/sh

hg init
hg log
hg grep wah
hg manifest
hg verify