Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 14230:d51630301241

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename util.lookup_reg to lookupreg
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 06 May 2011 15:16:22 +0200
parents 135e244776f0
children 4030630fb59c
line wrap: on
line diff
--- a/mercurial/filemerge.py	Fri May 06 15:13:46 2011 +0200
+++ b/mercurial/filemerge.py	Fri May 06 15:16:22 2011 +0200
@@ -29,7 +29,7 @@
         k = _toolstr(ui, tool, kn)
         if not k:
             continue
-        p = util.lookup_reg(k, _toolstr(ui, tool, "regname"))
+        p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
         if p:
             p = util.find_exe(p + _toolstr(ui, tool, "regappend"))
             if p: