mercurial/filemerge.py
branchstable
changeset 34946 5caae380ff90
parent 34915 cab34bda259e
child 35281 010179e21e91
equal deleted inserted replaced
34945:d2554ef04d26 34946:5caae380ff90
   114         k = _toolstr(ui, tool, kn)
   114         k = _toolstr(ui, tool, kn)
   115         if not k:
   115         if not k:
   116             continue
   116             continue
   117         p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
   117         p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
   118         if p:
   118         if p:
   119             p = util.findexe(p + _toolstr(ui, tool, "regappend"))
   119             p = util.findexe(p + _toolstr(ui, tool, "regappend", ""))
   120             if p:
   120             if p:
   121                 return p
   121                 return p
   122     exe = _toolstr(ui, tool, "executable", tool)
   122     exe = _toolstr(ui, tool, "executable", tool)
   123     return util.findexe(util.expandpath(exe))
   123     return util.findexe(util.expandpath(exe))
   124 
   124