diff -r a55a0045704c -r 4030630fb59c mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sun May 08 16:16:41 2011 -0500
+++ b/mercurial/filemerge.py	Sun May 08 20:35:46 2011 +0200
@@ -31,10 +31,10 @@
             continue
         p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
         if p:
-            p = util.find_exe(p + _toolstr(ui, tool, "regappend"))
+            p = util.findexe(p + _toolstr(ui, tool, "regappend"))
             if p:
                 return p
-    return util.find_exe(_toolstr(ui, tool, "executable", tool))
+    return util.findexe(_toolstr(ui, tool, "executable", tool))
 
 def _picktool(repo, ui, path, binary, symlink):
     def check(tool, pat, symlink, binary):