Mercurial > hg
view .arcconfig @ 39123:4d7b11877dd0
filemerge: add the function to examine a capability of a internal tool
For "symlink" and "binary" capabilities, _toolbool() can not examine
these of internal merge tools strictly, because it examines only
configurations in "merge-tools" section.
Users can configure them explicitly as below for example, but this is
not ordinary usage and not convenient:
[merge-tools]
:other.symlink = true
:other.binary = true
This patch adds hascapability() internal function, which can examine
actual capabilities of a internal merge tool strictly.
At this patch, hascapability() is still used with "strict=False".
Subsequent patches use it with "strict=True".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 14 Aug 2018 20:15:51 +0900 |
parents | b2c27d84f05c |
children | ff396501e841 |
line wrap: on
line source
{ "conduit_uri": "https://phab.mercurial-scm.org/api", "repository.callsign": "HG", "arc.land.onto.default": "@", "base": "hg:.^" }