##// END OF EJS Templates
update: remove redundant and misplaced merge tests...
update: remove redundant and misplaced merge tests The "nothing to merge" case is covered by test-merge-default.t. The "uncommitted changes" case is covered by test-merge1.t (and others). The "merge -f" case is covered by test-merge-force.t.

File last commit:

r18526:9409aeaa stable
r23472:48cdf90f default
Show More
branchentry.tmpl
8 lines | 337 B | application/x-cheetah | CheetahLexer
<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>