abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
<item>
<title>#desc|strip|firstline|strip|escape#</title>
<link>#url#?cs=#node|short#</link>
<description><![CDATA[#desc|strip|escape|addbreaks#]]></description>
<author>#author|obfuscate#</author>
<pubDate>#date|rfc822date#</pubDate>
</item>