Mercurial > hg > mercurial-crew-with-dirclash
view templates/gitweb/changelogentry.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 | ce8f31e0b3b8 |
children | 4272ae760bb1 |
line wrap: on
line source
<div> <a class="title" href="{url}rev/#node|short#{sessionvars%urlparameter}"><span class="age">#date|age# ago</span>#desc|strip|firstline|escape#</a> </div> <div class="title_text"> <div class="log_link"> <a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a><br/> </div> <i>#author|obfuscate# [#date|rfc822date#] rev #rev#</i><br/> </div> <div class="log_body"> #desc|strip|escape|addbreaks# <br/> <br/> </div>