--- a/tests/test-rename-merge1.out
+++ b/tests/test-rename-merge1.out
@@ -4,12 +4,16 @@ merge
 resolving manifests
  overwrite None partial False
  ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
+ a2: divergent renames -> dr
  a: remote moved to b -> m
  b2: remote created -> g
 merging a and b
 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
 copying a to b
 removing a
+warning: detected divergent renames of a2 to:
+ c2
+ b2
 getting b2
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)