##// 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:

r35052:e9a8a941 default
r49839:9dfbea54 default
Show More
changelogentry.tmpl
11 lines | 467 B | application/x-cheetah | CheetahLexer
<h3 class="changelog">
<a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
{desc|strip|firstline|escape|nonempty}
{alltags}
</a>
</h3>
<ul class="changelog-entry">
<li class="age">{date|rfc822date}</li>
<li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li>
<li class="description">{desc|strip|escape|websub|addbreaks|nonempty}</li>
</ul>