##// END OF EJS Templates
help: help topic for merge tools...
help: help topic for merge tools I have made a help topic for merge tools. The text in the topic is based on the http://mercurial.selenic.com/wiki/MergeProgram page from the wiki, along with some extra information on the internal merge tools.

File last commit:

r9999:f91e5630 default
r12771:c77f6276 default
Show More
changelogentry.tmpl
25 lines | 700 B | application/x-cheetah | CheetahLexer
<table class="logEntry parity{parity}">
<tr>
<th class="age">{date|age}:</th>
<th class="firstline">{desc|strip|firstline|escape|nonempty}</th>
</tr>
<tr>
<th class="revision">changeset {rev}:</th>
<td class="node"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
</tr>
{parent%changelogparent}
{child%changelogchild}
{changelogtag}
<tr>
<th class="author">author:</th>
<td class="author">{author|obfuscate}</td>
</tr>
<tr>
<th class="date">date:</th>
<td class="date">{date|date}</td>
</tr>
<tr>
<th class="files"><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>:</th>
<td class="files">{files}</td>
</tr>
</table>