tests/test-double-merge.out
changeset 5371 17ed9b9a0d03
parent 5042 f191bc3916f7
child 6004 5af5f0f9d724
--- a/tests/test-double-merge.out	Wed Oct 03 17:17:28 2007 -0500
+++ b/tests/test-double-merge.out	Thu Oct 04 19:44:37 2007 -0500
@@ -1,6 +1,12 @@
 resolving manifests
  overwrite None partial False
  ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
+  searching for copies back to rev 1
+  unmatched files in other:
+   bar
+  all copies found (* = to merge, ! = divergent):
+   bar -> foo *
+  checking for directory renames
  foo: versions differ -> m
  foo: remote copied to bar -> m
 copying foo to bar