test-confused-revert.out
25 lines
| 409 B
| text/plain
|
TextLexer
/ tests / test-confused-revert.out
Matt Mackall
|
r1449 | %%% should show a removed and b added | ||
A b | ||||
R a | ||||
reverting... | ||||
Vadim Gelfer
|
r2029 | saving current version of b as b.bak | ||
forgetting b | ||||
undeleting a | ||||
Matt Mackall
|
r1449 | %%% should show b unknown and a back to normal | ||
? b | ||||
Vadim Gelfer
|
r2029 | ? b.bak | ||
Matt Mackall
|
r1449 | merging a | ||
%%% should show foo-b | ||||
foo-b | ||||
%%% should show a removed and b added | ||||
A b | ||||
R a | ||||
Vadim Gelfer
|
r2029 | ? b.bak | ||
Matt Mackall
|
r1449 | reverting... | ||
Vadim Gelfer
|
r2029 | forgetting b | ||
undeleting a | ||||
Matt Mackall
|
r1449 | %%% should show b unknown and a marked modified (merged) | ||
? b | ||||
Vadim Gelfer
|
r2029 | ? b.bak | ||
Matt Mackall
|
r1449 | %%% should show foo-b | ||
foo-b | ||||