Mercurial > hg > mercurial-crew-with-dirclash
view templates/gitweb/footer.tmpl @ 4358:465b9ea02868
Import 3-way merge code from bzr
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | 2896ce093ec4 |
children | 46c5e1ee8aaa |
line wrap: on
line source
<div class="page_footer"> <div class="page_footer_text">#repo|escape#</div> <a class="rss_logo" href="#url#rss-log">RSS</a> <br /> #motd# </div> </body> </html>