Show More
@@ -1786,6 +1786,13 b' coreconfigitem(' | |||
|
1786 | 1786 | ) |
|
1787 | 1787 | coreconfigitem( |
|
1788 | 1788 | b'merge-tools', |
|
1789 | br'.*\.regappend$', | |
|
1790 | default=b"", | |
|
1791 | generic=True, | |
|
1792 | priority=-1, | |
|
1793 | ) | |
|
1794 | coreconfigitem( | |
|
1795 | b'merge-tools', | |
|
1789 | 1796 | br'.*\.symlink$', |
|
1790 | 1797 | default=False, |
|
1791 | 1798 | generic=True, |
@@ -158,7 +158,7 b' def findexternaltool(ui, tool):' | |||
|
158 | 158 | continue |
|
159 | 159 | p = util.lookupreg(k, _toolstr(ui, tool, b"regname")) |
|
160 | 160 | if p: |
|
161 |
p = procutil.findexe(p + _toolstr(ui, tool, b"regappend" |
|
|
161 | p = procutil.findexe(p + _toolstr(ui, tool, b"regappend")) | |
|
162 | 162 | if p: |
|
163 | 163 | return p |
|
164 | 164 | exe = _toolstr(ui, tool, b"executable", tool) |
General Comments 0
You need to be logged in to leave comments.
Login now