Mercurial > hg
comparison mercurial/help/config.txt @ 39125:cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
For historical reason, Mercurial assumes capabilities of internal
merge tools as below while examining rules to decide merge tool,
regardless of actual capabilities of them.
=============== ====== ========
specified via binary symlinks
=============== ====== ========
--tool o o
HGMERGE o o
merge-patterns o (*) x (*)
ui.merge x (*) x (*)
=============== ====== ========
This causes:
- unintentional internal merge tool is chosen for binary files via
merge-patterns section of configuration file
- explicit configuration of internal merge tool for symlinks is
ignored unintentionally
But on the other hand, simple "check capability strictly" might break
backward compatibility (e.g. existing merge automations), because it
changes the result of merge tool selection.
Therefore, this patch adds config knob "merge.strict-capability-check"
to control whether capabilities of internal merge tools should be
checked strictly or not.
If this configuration is true, capabilities of internal merge tools
are checked strictly in (*) cases above.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Wed, 15 Aug 2018 22:24:50 +0900 |
| parents | 755741c39230 |
| children | 56469d475341 |
comparison
equal
deleted
inserted
replaced
| 39124:6618634e3325 | 39125:cded904f7acc |
|---|---|
| 1345 halt the merge process on any merge tool failure. The merge process | 1345 halt the merge process on any merge tool failure. The merge process |
| 1346 can be restarted by using the ``resolve`` command. When a merge is | 1346 can be restarted by using the ``resolve`` command. When a merge is |
| 1347 halted, the repository is left in a normal ``unresolved`` merge state. | 1347 halted, the repository is left in a normal ``unresolved`` merge state. |
| 1348 (default: ``continue``) | 1348 (default: ``continue``) |
| 1349 | 1349 |
| 1350 ``strict-capability-check`` | |
| 1351 Whether capabilities of internal merge tools are checked strictly | |
| 1352 or not, while examining rules to decide merge tool to be used. | |
| 1353 (default: False) | |
| 1354 | |
| 1350 ``merge-patterns`` | 1355 ``merge-patterns`` |
| 1351 ------------------ | 1356 ------------------ |
| 1352 | 1357 |
| 1353 This section specifies merge tools to associate with particular file | 1358 This section specifies merge tools to associate with particular file |
| 1354 patterns. Tools matched here will take precedence over the default | 1359 patterns. Tools matched here will take precedence over the default |