abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
#header#<title>Mercurial Error</title></head><body><h2>Mercurial Error</h2><p>An error occured while processing your request:</p><p>#error|escape#</p>#footer#