tests/test-merge-remove.out
changeset 6299 653ddd1d7cd7
parent 6298 53cbb33e1269
child 6336 4b0c9c674707
--- 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
@@ -22,3 +22,15 @@
 M bar
 M foo1
   foo
+% reverting foo1 and bar
+warning: working directory has two parents, tag '.' uses the first
+saving current version of bar as bar.orig
+reverting bar
+saving current version of foo1 as foo1.orig
+reverting foo1
+n   0         -2 bar
+m 644         14 foo1
+copy: foo -> foo1
+M bar
+M foo1
+  foo