##// END OF EJS Templates
merge: move messages about possible conflicts a litte earlier...
merge: move messages about possible conflicts a litte earlier I actually wanted to reduce the amount of code around the call to applyupdates(), so I tried moving these warnings a little earlier, and I think it makes the output make a little more sense (see changes to test cases).

File last commit:

r18526:9409aeaa stable
r26957:d16d7317 default
Show More
shortlogentry.tmpl
7 lines | 281 B | application/x-cheetah | CheetahLexer
<table class="slogEntry parity{parity}">
<tr>
<td class="age">{date|rfc822date}</td>
<td class="author">{author|person}</td>
<td class="node"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></td>
</tr>
</table>