##// END OF EJS Templates
filemerge: make capability check for internal tools ignore merge-tools section...
filemerge: make capability check for internal tools ignore merge-tools section This is follow up of 4d7b11877dd0. Before this patch, capability check of internal merge tools falls back to _toolbool(), which examines configurations in "merge-tools" section. But "hg help config" explicitly says that "merge-tools" section configures external merge tools. Therefore, this patch makes capability check for internal tools in hascapability() always ignore configurations in merge-tools section. In this patch, command line configurations below are added at tests in tests/test-merge-tools.t, in order to confirm that explicit configuration is intentionally ignored at tool selection. --config merge-tools.:INTERNAL_TOOL.CAPABILITY=true

File last commit:

r19455:c229a5e7 default
r39302:82555d71 default
Show More
diffstat.tmpl
8 lines | 341 B | application/x-cheetah | CheetahLexer
<tr>
<td class="diffstat-file"><a href="#l{fileno}.1">{file|escape}</a></td>
<td class="diffstat-total" align="right">{total}</td>
<td class="diffstat-graph">
<span class="diffstat-add" style="width:{addpct}%;">&nbsp;</span>
<span class="diffstat-remove" style="width:{removepct}%;">&nbsp;</span>
</td>
</tr>