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

r35095:23bba755 default
r39302:82555d71 default
Show More
graphnode.tmpl
7 lines | 240 B | application/x-cheetah | CheetahLexer
changeset: {node|short}
user: {author|person}
date: {date|age}
summary: {desc|firstline|nonempty}
{branches%branchname}{tags%tagname}{bookmarks%bookmarkname}
node: ({col}, {row}) (color {color})
{edges%graphedge}