Mercurial > evolve
comparison tests/test-stabilize-result.t @ 3821:f67ac33c07d2
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
`evolve.interrupted-evolve` has the word evolve twice. Now that this help topic
is a part of evolve command, evolve.interrupted will mean the interrupted evolve
command only.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 11 Jun 2018 01:12:12 +0530 |
| parents | ededd22e7c7b |
| children | b293cce4ff55 |
comparison
equal
deleted
inserted
replaced
| 3811:3273b178c202 | 3821:f67ac33c07d2 |
|---|---|
| 80 move:[4] newer a | 80 move:[4] newer a |
| 81 atop:[5] changea | 81 atop:[5] changea |
| 82 merging a | 82 merging a |
| 83 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 83 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 84 evolve failed! | 84 evolve failed! |
| 85 see `hg help evolve.interrupted-evolve` | 85 see `hg help evolve.interrupted` |
| 86 abort: unresolved merge conflicts (see hg help resolve) | 86 abort: unresolved merge conflicts (see hg help resolve) |
| 87 [255] | 87 [255] |
| 88 $ hg revert -r "orphan()" a | 88 $ hg revert -r "orphan()" a |
| 89 $ hg diff | 89 $ hg diff |
| 90 diff -r 66719795a494 a | 90 diff -r 66719795a494 a |