diff -r 6618634e3325 -r cded904f7acc mercurial/help/config.txt
--- a/mercurial/help/config.txt	Wed Aug 15 22:24:38 2018 +0900
+++ b/mercurial/help/config.txt	Wed Aug 15 22:24:50 2018 +0900
@@ -1347,6 +1347,11 @@
    halted, the repository is left in a normal ``unresolved`` merge state.
    (default: ``continue``)
 
+``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``
 ------------------