tests/test-confused-revert.out
changeset 2029 d436b21b20dc
parent 1449 30146be3437c
child 2030 8d9ec30d58bc
--- a/tests/test-confused-revert.out	Fri Mar 31 03:25:35 2006 -0600
+++ b/tests/test-confused-revert.out	Fri Mar 31 10:37:25 2006 -0800
@@ -2,16 +2,24 @@
 A b
 R a
 reverting...
+saving current version of b as b.bak
+forgetting b
+undeleting a
 %%% should show b unknown and a back to normal
 ? b
+? b.bak
 merging a
 %%% should show foo-b
 foo-b
 %%% should show a removed and b added
 A b
 R a
+? b.bak
 reverting...
+forgetting b
+undeleting a
 %%% should show b unknown and a marked modified (merged)
 ? b
+? b.bak
 %%% should show foo-b
 foo-b