Changeset e479ff36a915…
Parent 17ad0cd5f14a…
by
Changes to one file · Browse files at e479ff36a915 Showing diff from parent 17ad0cd5f14a Diff from another changeset...
@@ -226,7 +226,11 @@ return values
+_difftools = None
def difftools(ui):
+ global _difftools
+ if _difftools:
+ return _difftools
tools = {}
for cmd, path in ui.configitems('extdiff'):
if cmd.startswith('cmd.'):
@@ -255,6 +259,7 @@ mopts = ui.config('merge-tools', t + '.diff3args', '')
dopts, mopts = shlex.split(dopts), shlex.split(mopts)
tools[t] = [filemerge._findtool(ui, t), dopts, mopts]
+ _difftools = tools
return tools
|
Loading...