##// END OF EJS Templates
run-tests.py must print changed test output no matter what exit code is.
run-tests.py must print changed test output no matter what exit code is.

File last commit:

r2175:b2ae81a7 default
r2213:6f76a479 default
Show More
test-confused-revert.out
25 lines | 594 B | text/plain | TextLexer
/ tests / test-confused-revert.out
%%% 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
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
%%% 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