Mercurial > public > mercurial-scm > hg

diff mercurial/filemerge.py @ 10339:23e608f42f2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix spaces/identation issues
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 05 Feb 2010 18:50:08 +0100
parents 08a0f04b56bd
children 184cdb66263e
line wrap: on
line diff
--- 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 = {}