mercurial/filemerge.py
changeset 49644 5744ceeb9067
parent 49167 7af798e497f5
child 49845 e0c0545e2e55
equal deleted inserted replaced
49643:e1c586b9a43c 49644:5744ceeb9067
   156         k = _toolstr(ui, tool, kn)
   156         k = _toolstr(ui, tool, kn)
   157         if not k:
   157         if not k:
   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)
   165     return procutil.findexe(util.expandpath(exe))
   165     return procutil.findexe(util.expandpath(exe))
   166 
   166