diff -r 13f0acfa974a -r 62c8f7691bc3 mercurial/merge.py
--- a/mercurial/merge.py	Mon Oct 18 14:37:52 2010 +0200
+++ b/mercurial/merge.py	Sun Oct 10 09:50:25 2010 -0500
@@ -355,7 +355,8 @@
             updated += 1
         elif m == "dr": # divergent renames
             fl = a[2]
-            repo.ui.warn(_("warning: detected divergent renames of %s to:\n") % f)
+            repo.ui.warn(_("note: possible conflict - %s was renamed "
+                           "multiple times to:\n") % f)
             for nf in fl:
                 repo.ui.warn(" %s\n" % nf)
         elif m == "e": # exec