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