2005-10-26 02:54:44 +04:00
|
|
|
%%% should show a removed and b added
|
|
|
|
A b
|
|
|
|
R a
|
|
|
|
reverting...
|
2006-03-31 22:37:25 +04:00
|
|
|
undeleting a
|
2006-04-03 21:02:09 +04:00
|
|
|
forgetting b
|
2005-10-26 02:54:44 +04:00
|
|
|
%%% should show b unknown and a back to normal
|
|
|
|
? b
|
2006-03-31 22:52:56 +04:00
|
|
|
? b.orig
|
2005-10-26 02:54:44 +04:00
|
|
|
merging a
|
|
|
|
%%% should show foo-b
|
|
|
|
foo-b
|
|
|
|
%%% should show a removed and b added
|
|
|
|
A b
|
|
|
|
R a
|
2006-03-31 22:52:56 +04:00
|
|
|
? b.orig
|
2005-10-26 02:54:44 +04:00
|
|
|
reverting...
|
2006-03-31 22:37:25 +04:00
|
|
|
undeleting a
|
2006-04-03 21:02:09 +04:00
|
|
|
forgetting b
|
2005-10-26 02:54:44 +04:00
|
|
|
%%% should show b unknown and a marked modified (merged)
|
|
|
|
? b
|
2006-03-31 22:52:56 +04:00
|
|
|
? b.orig
|
2005-10-26 02:54:44 +04:00
|
|
|
%%% should show foo-b
|
|
|
|
foo-b
|