[PATCH 5 of 6] filemerge: add config knob to check capabilities of internal merge tools

[Yuya Nishihara]

On Thu, 16 Aug 2018 03:35:37 +0900, FUJIWARA Katsunori wrote:
> +``strict-capability-check``
> +   Whether capabilities of internal merge tools are checked strictly
> +   or not, while examining rules to decide merge tool to be used.
> +   (default: False)
> +
>  ``merge-patterns``
>  ------------------
>  
> diff --git a/mercurial/help/merge-tools.txt b/mercurial/help/merge-tools.txt
> --- a/mercurial/help/merge-tools.txt
> +++ b/mercurial/help/merge-tools.txt
> @@ -80,10 +80,14 @@ step specified via   binary symlink
>  ==== =============== ====== =======
>  1.   --tool          o      o
>  2.   HGMERGE         o      o
> -3.   merge-patterns  o      x
> -4.   ui.merge        x      x
> +3.   merge-patterns  o (*)  x (*)
> +4.   ui.merge        x (*)  x (*)
>  ==== =============== ====== =======
>  
> +If ``merge.strict-capability-check`` configuration is true, Mercurial
> +checks capabilities of internal merge tools strictly in (*) cases
> +above. It is false by default for backward compatibility.

IIUC, strict-capability-check is also applied to external tools while picking
tool for a binary file.