equal
deleted
inserted
replaced
78 ==== =============== ====== ======= |
78 ==== =============== ====== ======= |
79 step specified via binary symlink |
79 step specified via binary symlink |
80 ==== =============== ====== ======= |
80 ==== =============== ====== ======= |
81 1. --tool o o |
81 1. --tool o o |
82 2. HGMERGE o o |
82 2. HGMERGE o o |
83 3. merge-patterns o x |
83 3. merge-patterns o (*) x (*) |
84 4. ui.merge x x |
84 4. ui.merge x (*) x (*) |
85 ==== =============== ====== ======= |
85 ==== =============== ====== ======= |
|
86 |
|
87 If ``merge.strict-capability-check`` configuration is true, Mercurial |
|
88 checks capabilities of internal merge tools strictly in (*) cases |
|
89 above. It is false by default for backward compatibility. |
86 |
90 |
87 .. note:: |
91 .. note:: |
88 |
92 |
89 After selecting a merge program, Mercurial will by default attempt |
93 After selecting a merge program, Mercurial will by default attempt |
90 to merge the files using a simple merge algorithm first. Only if it doesn't |
94 to merge the files using a simple merge algorithm first. Only if it doesn't |