Mercurial > hg
view mercurial/templates/atom/branchentry.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.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 08 Oct 2015 14:16:19 -0700 |
parents | 9409aeaafdc1 |
children | 6ab3465d9991 |
line wrap: on
line source
<entry> <title>{branch|escape}</title> <link rel="alternate" href="{urlbase}{url|urlescape}rev/{node|short}"/> <id>{urlbase}{url|urlescape}#branch-{node}</id> <updated>{date|rfc3339date}</updated> <published>{date|rfc3339date}</published> <content type="text"><![CDATA[{branch|strip|escape|addbreaks}]]></content> </entry>