Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
<item>
<title>#desc|firstline|escape#</title>
<link>#url#?cmd=file;file=#file#;filenode=#filenode#</link>
<description>#desc|escape|addbreaks#</description>
<author>#author|obfuscate#</author>
<pubDate>#date|rfc822date#</pubDate>>
</item>