equal
deleted
inserted
replaced
1444 - `hg evolve --continue`: |
1444 - `hg evolve --continue`: |
1445 fix all the conflicts using `hg resolve` and then run this to continue the |
1445 fix all the conflicts using `hg resolve` and then run this to continue the |
1446 interrupted evolve |
1446 interrupted evolve |
1447 |
1447 |
1448 - `hg evolve --stop`: |
1448 - `hg evolve --stop`: |
1449 stops the current interrupted evolve,. keeping all the successful steps, |
1449 stops the current interrupted evolve, keeping all the successful steps, |
1450 but delaying to resolution of the remaining step for later. |
1450 but delaying to resolution of the remaining step for later. |
1451 |
1451 |
1452 - `hg evolve --abort`: |
1452 - `hg evolve --abort`: |
1453 aborts the interrupted evolve and undoes all the resolution which have |
1453 aborts the interrupted evolve and undoes all the resolution which have |
1454 happened |
1454 happened |