| Thu, 06 Jun 2019 17:37:42 +0800 | Anton Shestakov | evolvecmd: the proper way to deal with conflicts is to resolve them | file | diff | annotate |
| Fri, 31 Aug 2018 09:21:19 +0200 | Pierre-Yves David | pick: replace `hg grab` invocation in test with `hg pick` | file | diff | annotate |
| Fri, 31 Aug 2018 09:13:11 +0200 | Pierre-Yves David | pick: update command output to mention pick instead of grab | file | diff | annotate |
| Fri, 15 Jun 2018 00:16:29 +0530 | Pulkit Goyal | evolve: raise error.InterventionRequired instead of Abort when conflicts | file | diff | annotate |
| Tue, 12 Jun 2018 19:00:12 +0530 | Pulkit Goyal | evolve: improve error messages when conflicts occur | file | diff | annotate |
| Sat, 28 Apr 2018 18:44:07 +0530 | Pulkit Goyal | tests: add test showing `hg evolve --stop` works fine with phase-divergence | file | diff | annotate |