Show More
@@ -72,22 +72,29 b' 7. If the file to be merged is not binar' | |||||
72 |
|
72 | |||
73 | 8. Otherwise, ``:prompt`` is used. |
|
73 | 8. Otherwise, ``:prompt`` is used. | |
74 |
|
74 | |||
75 |
For historical reason, Mercurial |
|
75 | For historical reason, Mercurial treats merge tools as below while | |
76 | merge tools as below while examining rules above, regardless of actual |
|
76 | examining rules above. | |
77 | capabilities of them. |
|
|||
78 |
|
77 | |||
79 | ==== =============== ====== ======= |
|
78 | ==== =============== ====== ======= | |
80 | step specified via binary symlink |
|
79 | step specified via binary symlink | |
81 | ==== =============== ====== ======= |
|
80 | ==== =============== ====== ======= | |
82 |
1. --tool o |
|
81 | 1. --tool o/o o/o | |
83 |
2. HGMERGE o |
|
82 | 2. HGMERGE o/o o/o | |
84 |
3. merge-patterns o |
|
83 | 3. merge-patterns o/o(*) x/?(*) | |
85 |
4. ui.merge x |
|
84 | 4. ui.merge x/?(*) x/?(*) | |
86 | ==== =============== ====== ======= |
|
85 | ==== =============== ====== ======= | |
87 |
|
86 | |||
|
87 | Each capability column indicates Mercurial behavior for | |||
|
88 | internal/external merge tools at examining each rule. | |||
|
89 | ||||
|
90 | - "o": "assume that a tool has capability" | |||
|
91 | - "x": "assume that a tool does not have capability" | |||
|
92 | - "?": "check actual capability of a tool" | |||
|
93 | ||||
88 | If ``merge.strict-capability-check`` configuration is true, Mercurial |
|
94 | If ``merge.strict-capability-check`` configuration is true, Mercurial | |
89 |
checks capabilities of |
|
95 | checks capabilities of merge tools strictly in (*) cases above (= each | |
90 |
|
|
96 | capability column becomes "?/?"). It is false by default for backward | |
|
97 | compatibility. | |||
91 |
|
98 | |||
92 | .. note:: |
|
99 | .. note:: | |
93 |
|
100 |
@@ -1918,20 +1918,26 b' Test dynamic list of merge tools only sh' | |||||
1918 | internal ":merge" is used. |
|
1918 | internal ":merge" is used. | |
1919 | 8. Otherwise, ":prompt" is used. |
|
1919 | 8. Otherwise, ":prompt" is used. | |
1920 |
|
1920 | |||
1921 |
For historical reason, Mercurial |
|
1921 | For historical reason, Mercurial treats merge tools as below while | |
1922 | tools as below while examining rules above, regardless of actual |
|
1922 | examining rules above. | |
1923 | capabilities of them. |
|
|||
1924 |
|
1923 | |||
1925 | step specified via binary symlink |
|
1924 | step specified via binary symlink | |
1926 | ---------------------------------- |
|
1925 | ---------------------------------- | |
1927 |
1. --tool o |
|
1926 | 1. --tool o/o o/o | |
1928 |
2. HGMERGE o |
|
1927 | 2. HGMERGE o/o o/o | |
1929 |
3. merge-patterns o |
|
1928 | 3. merge-patterns o/o(*) x/?(*) | |
1930 |
4. ui.merge x |
|
1929 | 4. ui.merge x/?(*) x/?(*) | |
|
1930 | ||||
|
1931 | Each capability column indicates Mercurial behavior for internal/external | |||
|
1932 | merge tools at examining each rule. | |||
|
1933 | ||||
|
1934 | - "o": "assume that a tool has capability" | |||
|
1935 | - "x": "assume that a tool does not have capability" | |||
|
1936 | - "?": "check actual capability of a tool" | |||
1931 |
|
1937 | |||
1932 | If "merge.strict-capability-check" configuration is true, Mercurial checks |
|
1938 | If "merge.strict-capability-check" configuration is true, Mercurial checks | |
1933 |
capabilities of |
|
1939 | capabilities of merge tools strictly in (*) cases above (= each capability | |
1934 | false by default for backward compatibility. |
|
1940 | column becomes "?/?"). It is false by default for backward compatibility. | |
1935 |
|
1941 | |||
1936 | Note: |
|
1942 | Note: | |
1937 | After selecting a merge program, Mercurial will by default attempt to |
|
1943 | After selecting a merge program, Mercurial will by default attempt to |
General Comments 0
You need to be logged in to leave comments.
Login now