##// 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
filelogentry.tmpl
5 lines | 323 B | application/x-cheetah | CheetahLexer
<tr class="parity{parity}">
<td class="age">{date|age}</td>
<td class="author">{author|person}</td>
<td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}</td>
</tr>