sapling/tests/test-confused-revert.out

25 lines
375 B
Plaintext
Raw Normal View History

%%% 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
? 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