Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 8269:bb9f13974d8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: use ui.warn() for warnings
author Steve Borho <steve@borho.org>
date Thu, 30 Apr 2009 23:57:36 -0500
parents 98acfd1d2b08
children b87a50b7125c
line wrap: on
line diff
--- a/mercurial/filemerge.py	Thu Apr 30 19:22:06 2009 -0500
+++ b/mercurial/filemerge.py	Thu Apr 30 23:57:36 2009 -0500
@@ -170,7 +170,7 @@
 
     # do we attempt to simplemerge first?
     if _toolbool(ui, tool, "premerge", not (binary or symlink)):
-        r = simplemerge.simplemerge(a, b, c, quiet=True)
+        r = simplemerge.simplemerge(ui, a, b, c, quiet=True)
         if not r:
             ui.debug(_(" premerge successful\n"))
             os.unlink(back)
@@ -187,7 +187,7 @@
                HG_BASE_ISLINK='l' in fca.flags())
 
     if tool == "internal:merge":
-        r = simplemerge.simplemerge(a, b, c, label=['local', 'other'])
+        r = simplemerge.simplemerge(ui, a, b, c, label=['local', 'other'])
     else:
         args = _toolstr(ui, tool, "args", '$local $base $other')
         if "$output" in args: