Mercurial > evolve
comparison tests/test-evolve-phase.t @ 3796:ededd22e7c7b
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
The help list various flags which you can use during interrupted evolve
resolution and description about what they do. This will be very helpful for
user on how to continue an interrupted evolve.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 06 Jun 2018 04:09:49 +0530 |
| parents | f6979d64b9fb |
| children | f67ac33c07d2 |
comparison
equal
deleted
inserted
replaced
| 3795:b8b4ff86feb8 | 3796:ededd22e7c7b |
|---|---|
| 85 move:[2] c | 85 move:[2] c |
| 86 atop:[3] b | 86 atop:[3] b |
| 87 merging a | 87 merging a |
| 88 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 88 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 89 evolve failed! | 89 evolve failed! |
| 90 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | 90 see `hg help evolve.interrupted-evolve` |
| 91 abort: unresolved merge conflicts (see hg help resolve) | 91 abort: unresolved merge conflicts (see hg help resolve) |
| 92 [255] | 92 [255] |
| 93 | 93 |
| 94 $ hg diff | 94 $ hg diff |
| 95 diff -r 87495ea7c9ec a | 95 diff -r 87495ea7c9ec a |