changeset 2043 | 968f036f93a4 |
parent 2042 | a514c7509fa9 |
child 2175 | b2ae81a7df29 |
--- a/tests/test-confused-revert.out Mon Apr 03 10:02:09 2006 -0700 +++ b/tests/test-confused-revert.out Mon Apr 03 21:01:33 2006 +0200 @@ -6,19 +6,16 @@ forgetting b %%% should show b unknown and a back to normal ? b -? b.orig merging a %%% should show foo-b foo-b %%% should show a removed and b added A b R a -? b.orig reverting... undeleting a forgetting b %%% should show b unknown and a marked modified (merged) ? b -? b.orig %%% should show foo-b foo-b