Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
header = header-rss.tmpl
changelog = changelog-rss.tmpl
changelogentry = changelogentry-rss.tmpl
filelog = filelog-rss.tmpl
filelogentry = filelogentry-rss.tmpl