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 |
Wed, 05 Jun 2019 17:56:44 +0200 | Pierre-Yves David | test-compat: merge mercurial-4.5 into mercurial-4.4 | file | diff | annotate |
Sun, 14 Apr 2019 02:18:19 +0800 | Anton Shestakov | tests: add --update to hg evolve to reduce test changes for the next patch | file | diff | annotate |
Tue, 22 Jan 2019 12:57:25 -0500 | Pierre-Yves David | test-compat: merge mercurial-4.5 into mercurial-4.4 | file | diff | annotate |
Tue, 21 Aug 2018 14:09:33 +0200 | Pierre-Yves David | test-compat: merge mercurial-4.4 into mercurial-4.3 | file | diff | annotate |
Tue, 21 Aug 2018 13:26:35 +0200 | Pierre-Yves David | test-compat: merge mercurial-4.5 into mercurial-4.4 | file | diff | annotate |
Sat, 18 Aug 2018 21:03:45 +0530 | Pulkit Goyal | evolve: set the second parent if we get conflicts while evolving | file | diff | annotate |