##// END OF EJS Templates
simplemerge: use same newline detection for :mergediff as for :merge[3]...
simplemerge: use same newline detection for :mergediff as for :merge[3] The `:merge` and `:merge3` markers used the newline style detected from the base input. The `:mergediff` style always used LF as newline character. This patch teaches `:mergediff` to use the same detection as the others did. Differential Revision: https://phab.mercurial-scm.org/D11976

File last commit:

r18526:9409aeaa stable
r49408:b5e1283c default
Show More
shortlogentry.tmpl
7 lines | 281 B | application/x-cheetah | CheetahLexer
<table class="slogEntry parity{parity}">
<tr>
<td class="age">{date|rfc822date}</td>
<td class="author">{author|person}</td>
<td class="node"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></td>
</tr>
</table>