equal
deleted
inserted
replaced
57 R a |
57 R a |
58 |
58 |
59 Revert should fail: |
59 Revert should fail: |
60 |
60 |
61 $ hg revert |
61 $ hg revert |
62 abort: no files or directories specified |
62 abort: uncommitted merge with no revision specified |
63 (uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge) |
63 (use "hg update" or see "hg help revert") |
64 [255] |
64 [255] |
65 |
65 |
66 Revert should be ok now: |
66 Revert should be ok now: |
67 |
67 |
68 $ hg revert -r2 --all |
68 $ hg revert -r2 --all |