changeset 2214 | 6c6c0e5595a2 |
parent 2175 | b2ae81a7df29 |
child 3092 | 25857e00af8e |
--- a/tests/test-confused-revert.out +++ b/tests/test-confused-revert.out @@ -16,7 +16,9 @@ foo-b %%% should show a removed and b added A b R a -reverting... +%%% revert should fail +abort: working dir has two parents; you must specify the revision to revert to +%%% revert should be ok now undeleting a forgetting b %%% should show b unknown and a marked modified (merged)