templates/footer.tmpl

run-tests.py: pass -L/--label to simplemerge

This should give us conflict markers that don't change from one run
to another.

Remove some sed's/egrep's from some tests.

#motd#
<div class="logo">
powered by<br/>
<a href="http://www.selenic.com/mercurial/">mercurial</a>
</div>

</body>
</html>