mercurial/filemerge.py
changeset 15264 157d93c41c10
parent 14749 e3be7dc9a5e1
child 15501 2371f4aea665
equal deleted inserted replaced
15263:70d7293c41d6 15264:157d93c41c10
    32         p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
    32         p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
    33         if p:
    33         if p:
    34             p = util.findexe(p + _toolstr(ui, tool, "regappend"))
    34             p = util.findexe(p + _toolstr(ui, tool, "regappend"))
    35             if p:
    35             if p:
    36                 return p
    36                 return p
    37     return util.findexe(_toolstr(ui, tool, "executable", tool))
    37     exe = _toolstr(ui, tool, "executable", tool)
       
    38     return util.findexe(util.expandpath(exe))
    38 
    39 
    39 def _picktool(repo, ui, path, binary, symlink):
    40 def _picktool(repo, ui, path, binary, symlink):
    40     def check(tool, pat, symlink, binary):
    41     def check(tool, pat, symlink, binary):
    41         tmsg = tool
    42         tmsg = tool
    42         if pat:
    43         if pat: