view mercurial/templates/atom/branches.tmpl @ 26572:c7850af6bb75

filemerge._merge: drop no longer necessary 'if r:' check

Cleanup from an earlier patch to make premerge be directly called from the main
filemerge function.

{header}
 <id>{urlbase}{url|urlescape}</id>
 <link rel="self" href="{urlbase}{url|urlescape}atom-tags"/>
 <link rel="alternate" href="{urlbase}{url|urlescape}tags"/>
 <title>{repo|escape}: branches</title>
 <summary>{repo|escape} branch history</summary>
 <author><name>Mercurial SCM</name></author>
 {latestentry%feedupdated}

 {entries%branchentry}
</feed>