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

r28719:dd2cf90a default
r49408:b5e1283c default
Show More
branches.tmpl
11 lines | 367 B | application/x-cheetah | CheetahLexer
{header}
<id>{urlbase}{url|urlescape}</id>
<link rel="self" href="{urlbase}{url|urlescape}atom-branches"/>
<link rel="alternate" href="{urlbase}{url|urlescape}branches"/>
<title>{repo|escape}: branches</title>
<summary>{repo|escape} branch history</summary>
<author><name>Mercurial SCM</name></author>
{latestentry%feedupdated}
{entries%branchentry}
</feed>