test-confused-revert.out
21 lines
| 348 B
| text/plain
|
TextLexer
/ tests / test-confused-revert.out
|
r1449 | %%% should show a removed and b added | ||
A b | ||||
R a | ||||
reverting... | ||||
|
r2042 | undeleting a | ||
|
r2029 | forgetting b | ||
|
r1449 | %%% 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... | ||||
|
r2042 | undeleting a | ||
|
r2029 | forgetting b | ||
|
r1449 | %%% should show b unknown and a marked modified (merged) | ||
? b | ||||
%%% should show foo-b | ||||
foo-b | ||||