view mercurial/templates/atom/error.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}
 <!-- Error -->
 <id>{urlbase}{url|urlescape}</id>
 <link rel="self" href="{urlbase}{url|urlescape}atom-log"/>
 <link rel="alternate" href="{urlbase}{url|urlescape}"/>
 <title>Error</title>
 <updated>1970-01-01T00:00:00+00:00</updated>
 <entry>
  <title>Error</title>
  <id>https://mercurial-scm.org/#error</id>
  <author>
    <name>mercurial</name>
  </author>
  <updated>1970-01-01T00:00:00+00:00</updated>
  <content type="text">{error|escape}</content>
 </entry>
</feed>