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

r35550:bb5a03df default
r49408:b5e1283c default
Show More
graphentry.tmpl
8 lines | 320 B | application/x-cheetah | CheetahLexer
<li class="parity{parity}" data-node="{node|short}">
<div class="fg">
<span class="desc">
<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>
</span>
<div class="info"><span class="age">{date|rfc822date}</span>, by {author|person}</div>
</div>
</li>