##// END OF EJS Templates
configitems: add a default value for "merge-tools.xxx.regappend"...
Matt Harbison -
r50539:5744ceeb default
parent child Browse files
Show More
@@ -1786,6 +1786,13 b' coreconfigitem('
1786 )
1786 )
1787 coreconfigitem(
1787 coreconfigitem(
1788 b'merge-tools',
1788 b'merge-tools',
1789 br'.*\.regappend$',
1790 default=b"",
1791 generic=True,
1792 priority=-1,
1793 )
1794 coreconfigitem(
1795 b'merge-tools',
1789 br'.*\.symlink$',
1796 br'.*\.symlink$',
1790 default=False,
1797 default=False,
1791 generic=True,
1798 generic=True,
@@ -158,7 +158,7 b' def findexternaltool(ui, tool):'
158 continue
158 continue
159 p = util.lookupreg(k, _toolstr(ui, tool, b"regname"))
159 p = util.lookupreg(k, _toolstr(ui, tool, b"regname"))
160 if p:
160 if p:
161 p = procutil.findexe(p + _toolstr(ui, tool, b"regappend", b""))
161 p = procutil.findexe(p + _toolstr(ui, tool, b"regappend"))
162 if p:
162 if p:
163 return p
163 return p
164 exe = _toolstr(ui, tool, b"executable", tool)
164 exe = _toolstr(ui, tool, b"executable", tool)
General Comments 0
You need to be logged in to leave comments. Login now