view tests/test-confused-revert.out @ 2058:7e0dd64b0718

Use the new format of setting tags in view extension (Debian bug #361897)
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 11 Apr 2006 12:44:13 +0200
parents 968f036f93a4
children b2ae81a7df29
line wrap: on
line source

%%% should show a removed and b added
A b
R a
reverting...
undeleting a
forgetting b
%%% should show b unknown and a back to normal
? b
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
reverting...
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b