author | Thomas Arendsen Hein <thomas@intevation.de> |
Sat, 01 Apr 2006 20:56:55 +0200 | |
changeset 2032 | cd6bdbc508dd |
parent 2030 | 8d9ec30d58bc |
child 2036 | c9226bcc288d |
permissions | -rw-r--r-- |
%%% should show a removed and b added A b R a reverting... saving current version of b as b.orig forgetting b undeleting a %%% 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... forgetting b undeleting a %%% should show b unknown and a marked modified (merged) ? b ? b.orig %%% should show foo-b foo-b