2019-06-06 | Anton Shestakov | evolvecmd: the proper way to deal with conflicts is to resolve them | file | diff | annotate |
2018-08-31 | Pierre-Yves David | pick: replace `hg grab` invocation in test with `hg pick` | file | diff | annotate |
2018-08-31 | Pierre-Yves David | pick: update command output to mention pick instead of grab | file | diff | annotate |
2018-06-14 | Pulkit Goyal | evolve: raise error.InterventionRequired instead of Abort when conflicts | file | diff | annotate |
2018-06-12 | Pulkit Goyal | evolve: improve error messages when conflicts occur | file | diff | annotate |
2018-04-28 | Pulkit Goyal | tests: add test showing `hg evolve --stop` works fine with phase-divergence | file | diff | annotate |