##// END OF EJS Templates
help: describe more detail about capabilities while deciding merge tool...
FUJIWARA Katsunori -
r39157:7c604463 default
parent child Browse files
Show More
@@ -54,8 +54,7 b' 2. If the ``HGMERGE`` environment variab'
54
54
55 3. If the filename of the file to be merged matches any of the patterns in the
55 3. If the filename of the file to be merged matches any of the patterns in the
56 merge-patterns configuration section, the first usable merge tool
56 merge-patterns configuration section, the first usable merge tool
57 corresponding to a matching pattern is used. Here, binary capabilities of the
57 corresponding to a matching pattern is used.
58 merge tool are not considered.
59
58
60 4. If ui.merge is set it will be considered next. If the value is not the name
59 4. If ui.merge is set it will be considered next. If the value is not the name
61 of a configured tool, the specified value is used and must be executable by
60 of a configured tool, the specified value is used and must be executable by
@@ -72,6 +71,19 b' 7. If the file to be merged is not binar'
72
71
73 8. Otherwise, ``:prompt`` is used.
72 8. Otherwise, ``:prompt`` is used.
74
73
74 For historical reason, Mercurial assumes capabilities of internal
75 merge tools as below while examining rules above, regardless of actual
76 capabilities of them.
77
78 ==== =============== ====== =======
79 step specified via binary symlink
80 ==== =============== ====== =======
81 1. --tool o o
82 2. HGMERGE o o
83 3. merge-patterns o x
84 4. ui.merge x x
85 ==== =============== ====== =======
86
75 .. note::
87 .. note::
76
88
77 After selecting a merge program, Mercurial will by default attempt
89 After selecting a merge program, Mercurial will by default attempt
@@ -1892,8 +1892,7 b' Test dynamic list of merge tools only sh'
1892 must be executable by the shell.
1892 must be executable by the shell.
1893 3. If the filename of the file to be merged matches any of the patterns in
1893 3. If the filename of the file to be merged matches any of the patterns in
1894 the merge-patterns configuration section, the first usable merge tool
1894 the merge-patterns configuration section, the first usable merge tool
1895 corresponding to a matching pattern is used. Here, binary capabilities
1895 corresponding to a matching pattern is used.
1896 of the merge tool are not considered.
1897 4. If ui.merge is set it will be considered next. If the value is not the
1896 4. If ui.merge is set it will be considered next. If the value is not the
1898 name of a configured tool, the specified value is used and must be
1897 name of a configured tool, the specified value is used and must be
1899 executable by the shell. Otherwise the named tool is used if it is
1898 executable by the shell. Otherwise the named tool is used if it is
@@ -1906,6 +1905,17 b' Test dynamic list of merge tools only sh'
1906 internal ":merge" is used.
1905 internal ":merge" is used.
1907 8. Otherwise, ":prompt" is used.
1906 8. Otherwise, ":prompt" is used.
1908
1907
1908 For historical reason, Mercurial assumes capabilities of internal merge
1909 tools as below while examining rules above, regardless of actual
1910 capabilities of them.
1911
1912 step specified via binary symlink
1913 ----------------------------------
1914 1. --tool o o
1915 2. HGMERGE o o
1916 3. merge-patterns o x
1917 4. ui.merge x x
1918
1909 Note:
1919 Note:
1910 After selecting a merge program, Mercurial will by default attempt to
1920 After selecting a merge program, Mercurial will by default attempt to
1911 merge the files using a simple merge algorithm first. Only if it
1921 merge the files using a simple merge algorithm first. Only if it
General Comments 0
You need to be logged in to leave comments. Login now