diff -r 13f0acfa974a -r 62c8f7691bc3 tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t	Mon Oct 18 14:37:52 2010 +0200
+++ b/tests/test-rename-merge2.t	Sun Oct 10 09:50:25 2010 -0500
@@ -383,7 +383,7 @@
    c: remote created -> g
   preserving rev for resolve of rev
   updating: a 1/3 files (33.33%)
-  warning: detected divergent renames of a to:
+  note: possible conflict - a was renamed multiple times to:
    b
    c
   updating: c 2/3 files (66.67%)