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

r35055:9acc0360 default
r39779:f803bcb9 default
Show More
shortlogentry.tmpl
8 lines | 258 B | application/x-cheetah | CheetahLexer
Alexander Plavin
hgweb: make stripes in log and search with CSS
r19452 <tr>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age">{date|rfc822date}</td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td class="author">{author|person}</td>
Anton Shestakov
hgweb: split some long lines in paper, gitweb and monoblue styles...
r25108 <td class="description">
<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>
av6
hgweb: move changeset "tags" to a template in map file (paper and coal)...
r35055 {alltags}
Anton Shestakov
hgweb: split some long lines in paper, gitweb and monoblue styles...
r25108 </td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>