##// END OF EJS Templates
merge: introduce hasconflicts() on mergeresult object...
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816

File last commit:

r35052:e9a8a941 default
r45835:0c849f01 default
Show More
changelogentry.tmpl
11 lines | 467 B | application/x-cheetah | CheetahLexer
av6
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)
r35051 <h3 class="changelog">
<a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
{desc|strip|firstline|escape|nonempty}
av6
hgweb: move changeset "tags" to a template in map file (gitweb and monoblue)...
r35052 {alltags}
av6
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)
r35051 </a>
</h3>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <ul class="changelog-entry">
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <li class="age">{date|rfc822date}</li>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li>
Angel Ezquerra
hgweb: apply the websub filter to revision descriptions...
r18628 <li class="description">{desc|strip|escape|websub|addbreaks|nonempty}</li>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </ul>