##// END OF EJS Templates
partial-merge: add support for `.args` config (`$local` etc.)...
partial-merge: add support for `.args` config (`$local` etc.) It will be useful to be able to define custom command-line arguments per partial merge tool just like we have for regular merge tools. In particular, I expect the same binary to handle multiple languages, so it will be useful to be able to pass some argument indicating the language, or perhaps simply an argument defining a regex that's used for finding lines to merge as a sorted set. Differential Revision: https://phab.mercurial-scm.org/D12383

File last commit:

r23828:8b79fdaa default
r49839:9dfbea54 default
Show More
filelogentry.tmpl
25 lines | 877 B | application/x-cheetah | CheetahLexer
<table class="logEntry parity{parity}">
<tr>
<th class="label"><span class="age">{date|rfc822date}</span>:</th>
<th class="firstline"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></th>
</tr>
<tr>
<th class="revision">revision {filerev}:</th>
<td class="node">
<a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
<a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(diff)</a>
<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(annotate)</a>
</td>
</tr>
{rename%filelogrename}
<tr>
<th class="author">author:</th>
<td class="author">{author|obfuscate}</td>
</tr>
<tr>
<th class="date">date:</th>
<td class="date">{date|rfc822date}</td>
</tr>
</table>