Sat, 18 Aug 2018 21:03:45 +0530 | Pulkit Goyal | evolve: set the second parent if we get conflicts while evolving | file | diff | annotate |
Fri, 03 Aug 2018 00:22:50 +0200 | Pierre-Yves David | test-compat: merge mercurial-4.4 into mercurial-4.3 | file | diff | annotate |
Thu, 02 Aug 2018 02:47:44 +0200 | Pierre-Yves David | test-compat: merge mercurial-4.5 into mercurial-4.4 | 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 |
Mon, 11 Jun 2018 01:12:12 +0530 | Pulkit Goyal | evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted | file | diff | annotate |
Wed, 06 Jun 2018 04:09:49 +0530 | Pulkit Goyal | evolve: show `hg help evolve.interrupted-evolve` in error when conflicts | file | diff | annotate |