tests/test-merge-remove.out
changeset 6298 53cbb33e1269
parent 6297 fed1a9c22076
child 6299 653ddd1d7cd7
--- a/tests/test-merge-remove.out	Tue Mar 18 04:07:39 2008 -0300
+++ b/tests/test-merge-remove.out	Tue Mar 18 04:07:39 2008 -0300
@@ -13,3 +13,12 @@
 R bar
 R foo1
   foo
+% readding foo1 and bar
+adding bar
+adding foo1
+n   0         -2 bar
+m 644         14 foo1
+copy: foo -> foo1
+M bar
+M foo1
+  foo