--- a/tests/test-rename-merge2.out	Fri Jan 11 23:36:56 2008 +0100
+++ b/tests/test-rename-merge2.out	Mon Jan 14 16:28:32 2008 -0600
@@ -228,8 +228,8 @@
   unmatched files in other:
    c
   all copies found (* = to merge, ! = divergent):
-   c -> a 
-   b -> a 
+   c -> a !
+   b -> a !
   checking for directory renames
  a: divergent renames -> dr
  rev: versions differ -> m