##// END OF EJS Templates
tests: add test for path conflicts during merge...
tests: add test for path conflicts during merge Differential Revision: https://phab.mercurial-scm.org/D787

File last commit:

r33557:875b054e default
r34559:f71c712e default
Show More
changelogentry.tmpl
12 lines | 576 B | application/x-cheetah | CheetahLexer
<div>
<a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|rfc822date}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
</div>
<div class="title_text">
<div class="log_link">
<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a><br/>
</div>
<i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>
</div>
<div class="log_body description">{desc|strip|escape|websub|nonempty}
</div>