diff -r b9e44cc97355 -r 23e608f42f2c mercurial/filemerge.py
--- a/mercurial/filemerge.py	Wed Feb 03 16:09:19 2010 +0000
+++ b/mercurial/filemerge.py	Fri Feb 05 18:50:08 2010 +0100
@@ -60,8 +60,8 @@
     for pat, tool in ui.configitems("merge-patterns"):
         mf = match.match(repo.root, '', [pat])
         if mf(path) and check(tool, pat, symlink, False):
-                toolpath = _findtool(ui, tool)
-                return (tool, '"' + toolpath + '"')
+            toolpath = _findtool(ui, tool)
+            return (tool, '"' + toolpath + '"')
 
     # then merge tools
     tools = {}