tests/test-rename-merge2.t
changeset 18362 5a4f220fbfca
parent 18135 a6fe1b9cc68f
child 18539 cf25e4efd685
--- a/tests/test-rename-merge2.t	Tue Jan 15 02:59:12 2013 +0100
+++ b/tests/test-rename-merge2.t	Wed Dec 12 02:38:14 2012 +0100
@@ -370,8 +370,8 @@
     unmatched files in other:
      c
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     src: 'a' -> dst: 'b' !
      src: 'a' -> dst: 'c' !
-     src: 'a' -> dst: 'b' !
     checking for directory renames
    a: divergent renames -> dr
   resolving manifests