evolvecmd: the proper way to deal with conflicts is to resolve them
And it's worth making the suggestion an actual hint.
Showing
- CHANGELOG 5 additions, 0 deletionsCHANGELOG
- hgext3rd/evolve/evolvecmd.py 8 additions, 6 deletionshgext3rd/evolve/evolvecmd.py
- tests/test-evolve-abort-orphan.t 16 additions, 8 deletionstests/test-evolve-abort-orphan.t
- tests/test-evolve-abort-phasediv.t 8 additions, 4 deletionstests/test-evolve-abort-phasediv.t
- tests/test-evolve-content-divergent-basic.t 6 additions, 3 deletionstests/test-evolve-content-divergent-basic.t
- tests/test-evolve-content-divergent-corner-cases.t 2 additions, 1 deletiontests/test-evolve-content-divergent-corner-cases.t
- tests/test-evolve-content-divergent-interrupted.t 14 additions, 7 deletionstests/test-evolve-content-divergent-interrupted.t
- tests/test-evolve-content-divergent-relocation.t 6 additions, 3 deletionstests/test-evolve-content-divergent-relocation.t
- tests/test-evolve-continue.t 16 additions, 8 deletionstests/test-evolve-continue.t
- tests/test-evolve-issue5966.t 2 additions, 1 deletiontests/test-evolve-issue5966.t
- tests/test-evolve-orphan-merge.t 4 additions, 2 deletionstests/test-evolve-orphan-merge.t
- tests/test-evolve-phase-divergence.t 2 additions, 1 deletiontests/test-evolve-phase-divergence.t
- tests/test-evolve-phase.t 2 additions, 1 deletiontests/test-evolve-phase.t
- tests/test-evolve-progress.t 2 additions, 1 deletiontests/test-evolve-progress.t
- tests/test-evolve-public-content-divergent-corner-cases.t 4 additions, 2 deletionstests/test-evolve-public-content-divergent-corner-cases.t
- tests/test-evolve-public-content-divergent-discard.t 10 additions, 5 deletionstests/test-evolve-public-content-divergent-discard.t
- tests/test-evolve-public-content-divergent-main.t 10 additions, 5 deletionstests/test-evolve-public-content-divergent-main.t
- tests/test-evolve-stop-orphan.t 12 additions, 6 deletionstests/test-evolve-stop-orphan.t
- tests/test-evolve-stop-phasediv.t 2 additions, 1 deletiontests/test-evolve-stop-phasediv.t
- tests/test-evolve-topic.t 2 additions, 1 deletiontests/test-evolve-topic.t
Loading
Please register or sign in to comment