tests/test-double-merge.t
changeset 16795 e9ae770eff1c
parent 15625 efdcce3fd2d5
child 16913 f2719b387380
--- a/tests/test-double-merge.t	Wed May 23 20:50:16 2012 +0200
+++ b/tests/test-double-merge.t	Wed May 23 21:34:29 2012 +0200
@@ -29,7 +29,7 @@
     searching for copies back to rev 1
     unmatched files in other:
      bar
-    all copies found (* = to merge, ! = divergent):
+    all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      bar -> foo *
     checking for directory renames
   resolving manifests