##// END OF EJS Templates
meld: enable auto-merge...
meld: enable auto-merge This tells meld to resolve trivial conflicts before presenting the user with the remaining conflicts. This was attempted 5 years ago, but then --auto-merge was too new that the patch was rejected out of concern that users still had an older version of meld installed [1]. Maybe it's safe to assume that they have a newer version now. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2013-April/050084.html Differential Revision: https://phab.mercurial-scm.org/D4665

File last commit:

r35547:5afe0ca5 default
r39779:f803bcb9 default
Show More
graphentry.tmpl
9 lines | 309 B | application/x-cheetah | CheetahLexer
av6
paper: render changesets server-side on /graph page
r35219 <li data-node="{node|short}">
av6
paper: make actual changeset entries have backgrounds on /graph...
r35547 <div class="fg">
<span class="desc">
<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>
</span>
{alltags}
<div class="info"><span class="age">{date|rfc822date}</span>, by {author|person}</div>
</div>
av6
paper: render changesets server-side on /graph page
r35219 </li>