equal
deleted
inserted
replaced
15 foo-b |
15 foo-b |
16 %%% should show a removed and b added |
16 %%% should show a removed and b added |
17 A b |
17 A b |
18 R a |
18 R a |
19 %%% revert should fail |
19 %%% revert should fail |
20 abort: working dir has two parents; you must specify the revision to revert to |
20 abort: uncommitted merge - please provide a specific revision |
21 %%% revert should be ok now |
21 %%% revert should be ok now |
22 undeleting a |
22 undeleting a |
23 forgetting b |
23 forgetting b |
24 %%% should show b unknown and a marked modified (merged) |
24 %%% should show b unknown and a marked modified (merged) |
25 ? b |
25 ? b |